From 2688eada6ed7253845f0f113f4f3e22febc4a221 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 1 Apr 2011 17:51:32 +0530 Subject: [PATCH] [FIX] payroll bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal --- addons/hr_payroll/hr_payroll.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index fc13a62dd47..9c42d803b63 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -775,8 +775,10 @@ class hr_payslip(osv.osv): obj[cd] = line.amount or 0.0 for line in rules: - if line.category_id.code in ad: - continue + #Removing below condition because it stop to append child rule in payslip line and does not allow child rule to consider in calculation +# if line.category_id.code in ad: +# continue + ad.append(line.category_id.code) cd = line.category_id.code.lower() calculate = False @@ -1095,8 +1097,11 @@ class hr_payslip(osv.osv): obj[cd] = line.amount or 0.0 for line in rules: - if line.category_id.code in ad: - continue + + #Removing below condition because it stop to append child rule in payslip line and does not allow child rule to consider in calculation +# if line.category_id.code in ad: +# continue + ad.append(line.category_id.code) cd = line.category_id.code.lower() calculate = False