Merge lp:~openerp-dev/openobject-addons/7.0-opw-606399-ado into lp:openobject-addons/7.0

[Amit Dodiya (OpenERP)]

Hello,

FIX]hr_payroll_account: set partner_id in all journal entries created from payslip

Issue:
partner_id is not added in all journal items created from hr payslip, partner_id is only added on receivable/payable account entries.

For reproduce the issue refer the bug: https://bugs.launchpad.net/openobject-addons/+bug/1304507

Regards,
Amit Dodiya

[Martin Trigaux (OpenERP) (mat-openerp)]

As discussed on the bug report, this is the expected behaviour. Rejecting this one then.

Unmerged revisions

9981. By Amit Dodiya (OpenERP) on 2014-04-15

[FIX]hr_payroll_account: set partner_id in all journal entries created from payslip

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py	2014-03-04 11:31:17 +0000
+++ hr_payroll_account/hr_payroll_account.py	2014-04-15 04:44:33 +0000
@@ -159,7 +159,7 @@
                 adjust_credit = (0, 0, {
                     'name': _('Adjustment Entry'),
                     'date': timenow,
-                    'partner_id': False,
+                    'partner_id': partner_id,
                     'account_id': acc_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
@@ -175,7 +175,7 @@
                 adjust_debit = (0, 0, {
                     'name': _('Adjustment Entry'),
                     'date': timenow,
-                    'partner_id': False,
+                    'partner_id': partner_id,
                     'account_id': acc_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,