Merge lp:~openerp-dev/openobject-addons/trunk-bug-893469-mdi into lp:openobject-addons

Proposed by DJ Patel (OpenERP)
Status: Merged
Approved by: Raphael Collet (OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 5825
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-893469-mdi
Merge into: lp:openobject-addons
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:~openerp-dev/openobject-addons/trunk-bug-893469-mdi
Reviewer Review Type Date Requested Status
Purnendu Singh (OpenERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+83006@code.launchpad.net

Description of the change

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/893469 "payroll_account: On payslip confirmation it should write the period_id on employee payslip".

Thanks and Regards,

Divyesh Makwana(MDI)

To post a comment you must log in.
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_payroll_account/hr_payroll_account.py'
2--- hr_payroll_account/hr_payroll_account.py 2011-11-17 19:14:55 +0000
3+++ hr_payroll_account/hr_payroll_account.py 2011-11-22 12:22:27 +0000
4@@ -171,7 +171,7 @@
5 line_ids.append(adjust_debit)
6 move.update({'line_id': line_ids})
7 move_id = move_pool.create(cr, uid, move, context=context)
8- self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
9+ self.write(cr, uid, [slip.id], {'move_id': move_id, 'period_id' : period_id}, context=context)
10 if slip.journal_id.entry_posted:
11 move_pool.post(cr, uid, [move_id], context=context)
12 return super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)

Subscribers

People subscribed via source and target branches

to all changes: