[IMP] hr_payroll: again committing changes which got reverted
bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
This commit is contained in:
parent
2d7687ab6e
commit
4f27ec3e8f
|
@ -750,7 +750,7 @@ class hr_payslip(osv.osv):
|
|||
total = 0.0
|
||||
obj = {'basic': contract.wage}
|
||||
for line in rules:
|
||||
cd = line.code.lower()
|
||||
cd = line.code
|
||||
obj[cd] = line.amount or 0.0
|
||||
|
||||
for line in rules:
|
||||
|
@ -761,6 +761,7 @@ class hr_payslip(osv.osv):
|
|||
calculate = False
|
||||
try:
|
||||
exp = line.conditions
|
||||
exec line.conditions in obj
|
||||
calculate = eval(exp, obj)
|
||||
except Exception, e:
|
||||
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
|
||||
|
|
|
@ -310,6 +310,7 @@
|
|||
<field name="appears_on_payslip_rule" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Details by salary head">
|
||||
<field name="details_by_salary_head" nolabel="1" context="{'group_by': 'category_id'}"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<group col="10" colspan="4">
|
||||
|
|
Loading…
Reference in New Issue