From c369b997124ad7fcaecfcee1fa8af39ae2f8de4f Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 4 Apr 2011 15:36:37 +0530 Subject: [PATCH] [FIX] hr_payroll bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp --- addons/hr_payroll/hr_payroll.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 7286686990f..9375d4c2184 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1097,7 +1097,6 @@ class hr_payslip(osv.osv): }) return update update['value'].update({'contract_id': False, 'struct_id': False}) - final_total = 0.0 all_basic = 0.0 net_allow = 0.0 @@ -1247,8 +1246,8 @@ class hr_payslip(osv.osv): # 'company_id': employee_id.company_id.id # }) - basic_before_leaves = update['value']['basic_amount'] - total_before_leaves = update['value']['total_pay'] + basic_before_leaves = all_basic + total_before_leaves = final_total working_day = 0 off_days = 0 dates = prev_bounds(ddate)