Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-575085-nep into lp:openobject-addons/6.1

  1. 6.1-opw-575085-nep
  2. Merge into 6.1
Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6808
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-575085-nep
Merge into: lp:openobject-addons/6.1
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/6.1-opw-575085-nep
Reviewer Review Type Date Requested Status
Michael (OpenERP) (community) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+107192@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.

This fixes the issue.

Thanks.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Reply
Revision history for this message
Michael (OpenERP) (mva-openerp) :
review: Approve
Reply
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-575085-port-mma/+merge/132448 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Reply

Unmerged revisions

6808. By Nehal Panchal (OpenERP)

[FIX] hr_payroll : On clicking the Confirm button the salary slip must be computed as well, which is not happening

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-01-31 13:36:57 +0000
3+++ hr_payroll/hr_payroll.py 2012-05-24 10:35:26 +0000
4@@ -328,6 +328,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):