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

[IMP] hr_payroll:improved code for min and max range condition for amount_type=percentage 

bzr revid: mtr@mtr-20110314094429-zulakh5vl7cykotu
This commit is contained in:
mtr 2011-03-14 15:14:29 +05:30
parent 617ec80f97
commit 007e96a197
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/hr_payroll/hr_payroll.py
View File

@ -960,13 +960,14 @@ class hr_payslip(osv.osv):
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
if line.amount_type == 'per':
try:
value = line.amount * amt
if line.condition_range_min or line.condition_range_max:
if ((line.amount < line.condition_range_min) or (line.amount > line.condition_range_max)):
value = value
if ((value < line.condition_range_min) or (value > line.condition_range_max)):
value = 0.0
else:
value = line.amount * amt
value = value
else:
value = line.amount * amt
value = value
except Exception, e:
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
@ -997,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 ((value < line.condition_range_min) or (value > line.condition_range_max)):
update['value']['line_ids'].append(vals)
else:
update['value']['line_ids'].append(vals)