Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-opw-575085-port-mma into lp:openobject-addons

  1. trunk-opw-575085-port-mma
  2. Merge into trunk
Proposed by Mayur Maheshwari(OpenERP)
Status: Merged
Merged at revision: 8001
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-opw-575085-port-mma
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-0)
1 file modified
hr_payroll/hr_payroll.py (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-opw-575085-port-mma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+132448@code.launchpad.net

Description of the change

Hello,

         On clicking the "Confirm" button the salary slip must be computed as well, which is not happening yet.

         This branch fixes the issue.
         Code is forward port from 6.1

Thanks
Mayur

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 'hr_payroll/hr_payroll.py'
2--- hr_payroll/hr_payroll.py 2012-10-12 11:42:58 +0000
3+++ hr_payroll/hr_payroll.py 2012-11-01 05:13:21 +0000
4@@ -331,6 +331,7 @@
5 return self.write(cr, uid, ids, {'paid': True, 'state': 'done'}, context=context)
6
7 def hr_verify_sheet(self, cr, uid, ids, context=None):
8+ self.compute_sheet(cr, uid, ids, context)
9 return self.write(cr, uid, ids, {'state': 'verify'}, context=context)
10
11 def refund_sheet(self, cr, uid, ids, context=None):

Subscribers

People subscribed via source and target branches

to all changes: