odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] payroll 

bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
This commit is contained in:
Mustufa Rangwala 2011-04-01 17:51:32 +05:30
parent 33a795167f
commit 2688eada6e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/hr_payroll/hr_payroll.py
View File

@ -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