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

[IMP] hr_payroll: Code improved 

bzr revid: mra@mra-laptop-20110314072317-rivtyc4yokwvsqtd
This commit is contained in:
Mustufa Rangwala 2011-03-14 12:53:17 +05:30
parent 46f2aac28f
commit a523e73c1e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/hr_payroll/hr_payroll.py
View File

@ -922,12 +922,10 @@ class hr_payslip(osv.osv):
lines = []
rules = []
if function:
for struct in sal_structure:
func = func_pool.read(cr, uid, struct, ['rule_ids'], context=context)
lines = salary_rule_pool.browse(cr, uid, func['rule_ids'], context=context)
for rl in lines:
rules.append(rl)
for struct in sal_structure:
lines = func_pool.browse(cr, uid, struct, context=context).rule_ids
for rl in lines:
rules.append(rl)
ad = []
total = 0.0
@ -1000,7 +998,7 @@ class hr_payslip(osv.osv):
}
if line.appears_on_payslip:
if line.condition_range_min or line.condition_range_max:
if not((line.amount < line.condition_range_min) or (line.amount > line.condition_range_max)):
if not ((line.amount < line.condition_range_min) or (line.amount > line.condition_range_max)):
update['value']['line_ids'].append(vals)
else:
update['value']['line_ids'].append(vals)