Unifield Server

Merge lp:~unifield-team/unifield-server/homere_error_encoding into lp:unifield-server

  1. homere_error_encoding
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3757
Proposed branch: lp:~unifield-team/unifield-server/homere_error_encoding
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/homere_error_encoding
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+295157@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py'
2--- bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py 2016-04-26 12:21:13 +0000
3+++ bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py 2016-05-19 07:06:57 +0000
4@@ -592,7 +592,7 @@
5 for employee_infos in staff_data:
6 employee_code = employee_infos[0]
7 if employee_code in duplicates:
8- details.append(','.join([employee_infos[1], employee_infos[2]]))
9+ details.append(','.join([ustr(employee_infos[1]), ustr(employee_infos[2])]))
10 res = True
11 if not details:
12 created = 0

Subscribers

People subscribed via source and target branches

to all changes: