Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-584397-dhs into lp:openobject-addons/6.1

  1. 6.1-opw-584397-dhs
  2. Merge into 6.1
Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-584397-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 13 lines (+3/-0)
1 file modified
hr_payroll/hr_payroll.py (+3/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-584397-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+148627@code.launchpad.net

Description of the change

Install Hr Payroll.

Create Payslip for Bonmay, Varify sheet without clicking Button "compute Sheet" .

It verifies with no lines, and payslip in done state.

To post a comment you must log in.

Unmerged revisions

7154. By Dhruti Shastri(OpenERP)

[hr_payroll] : Directly clicking on Varify button gives Salary slip without Salary lines(Case:584397)

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 2013-02-15 08:14:26 +0000
4@@ -325,6 +325,9 @@
5 return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
6
7 def process_sheet(self, cr, uid, ids, context=None):
8+ for payslip in self.browse(cr, uid, ids, context=context):
9+ if not payslip.line_ids :
10+ self.compute_sheet(cr, uid, ids, context=context)
11 return self.write(cr, uid, ids, {'paid': True, 'state': 'done'}, context=context)
12
13 def hr_verify_sheet(self, cr, uid, ids, context=None):