unifield-wm

Merge lp:~jfb-tempo-consulting/unifield-wm/us-132 into lp:unifield-wm

  1. us-132
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2409
Proposed branch: lp:~jfb-tempo-consulting/unifield-wm/us-132
Merge into: lp:unifield-wm
Diff against target: 12 lines (+1/-1)
1 file modified
msf_homere_interface/wizard/hr_payroll_import.py (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-wm/us-132
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+252726@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 'msf_homere_interface/wizard/hr_payroll_import.py'
2--- msf_homere_interface/wizard/hr_payroll_import.py 2015-02-04 15:23:36 +0000
3+++ msf_homere_interface/wizard/hr_payroll_import.py 2015-03-12 10:53:01 +0000
4@@ -132,7 +132,7 @@
5 raise osv.except_osv(_('Warning'), _('This account is a view type account: %s') % (ustr(accounting_code[0]),))
6 # Check if it's a payroll rounding line
7 is_payroll_rounding = False
8- if third and third[0] and ustr(third[0]) in ('SAGA_BALANCE', 'CSH_DIFF'):
9+ if third and third[0] and ustr(third[0]) == 'SAGA_BALANCE' or accounting_code[0] == '67000':
10 is_payroll_rounding = True
11 # Check if it's a counterpart line (In HOMERE import, it seems to be lines that have a filled in column "third")
12 is_counterpart = False

Subscribers

People subscribed via source and target branches