Odoo Addons (MOVED TO GITHUB)

Merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-fix-1085522 into lp:openobject-addons/6.1

  1. 6.1-fix-1085522
  2. Merge into 6.1
Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/6.1-fix-1085522
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
hr_payroll_account/hr_payroll_account.py (+1/-1)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-fix-1085522
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+137589@code.launchpad.net

Commit message

[MRG] Generate accounting entry line for all payslip lines

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
=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2011-12-19 16:54:40 +0000
+++ hr_payroll_account/hr_payroll_account.py 2012-12-03 15:07:22 +0000
@@ -107,7 +107,7 @@
107 'journal_id': slip.journal_id.id,107 'journal_id': slip.journal_id.id,
108 'period_id': period_id,108 'period_id': period_id,
109 }109 }
110 for line in slip.line_ids:110 for line in slip.details_by_salary_rule_category:
111 amt = slip.credit_note and -line.total or line.total111 amt = slip.credit_note and -line.total or line.total
112 partner_id = False112 partner_id = False
113 debit_account_id = line.salary_rule_id.account_debit.id113 debit_account_id = line.salary_rule_id.account_debit.id