Merge lp:~openerp-dev/openobject-addons/6.0-opw-587811-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello Sir,

[FIX]hr_payroll: Leaves are deducted twice when computing the payslip.

Steps:
1. install hr_payroll_account and hr_payroll module.
2. Create Contract for employee "Quentin Paolino" and select salary structure as "Marketing Executive".
3. On leave type "Casual Leave" in Payroll Configuration select payment: Un-Paid Holiday, Payroll Head: Leave without pay
4. create leave request for 2 days and approve it.
5. Open/Create Employee Payslip for employee "Quentin Paolino" and press button "Compute sheet" check total Payment it is calculated wrong. Deduction of leave are twice, 1. From the Basic salary 2. from the Gross Salary - deduction.

In current scenario HRA is calculated after the leave deduction(as per as my understanding which should be on basic only not after deduction) and then the rest calculation, once the gross salary calculated then again leaves+deduction(eg:PF,PT etc) calculated, Result: Total salary is calculated wrong.

This branch fixes this issue. Kindly review the branch and please share your views on it.

Thanks & Regards,
Somesh Khare

Unmerged revisions

5452. By Somesh Khare on 2013-03-14

[FIX]hr_payroll: Leaves are deducted twice when computing the payslip (Case:Ref 587811)

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2011-08-05 07:46:37 +0000
+++ hr_payroll/hr_payroll.py	2013-03-14 06:56:23 +0000
@@ -819,10 +819,11 @@
         register_pool = self.pool.get('company.contribution')
         res = {}
         for rs in self.browse(cr, uid, ids, context=context):
+            basic = rs.contract_id and rs.contract_id.wage or rs.basic
             allow = 0.0
             deduct = 0.0
             others = 0.0
-            obj = {'basic':rs.basic}
+            obj = {'basic':basic}
             if rs.igross > 0:
                 obj['gross'] = rs.igross
             if rs.inet > 0:
@@ -863,10 +864,10 @@
             record = {
                 'allounce':allow,
                 'deduction':deduct,
-                'grows':rs.basic + allow,
-                'net':rs.basic + allow - deduct,
+                'grows':basic + allow,
+                'net':basic + allow - deduct,
                 'other_pay':others,
-                'total_pay':rs.basic + allow - deduct
+                'total_pay':basic + allow - deduct
             }
             res[rs.id] = record
         return res