Compare commits
5 Commits
295d176cfc
...
613cd46b2a
Author | SHA1 | Date |
---|---|---|
oscar alvarez | 613cd46b2a | |
oscar alvarez | e11c7cfb09 | |
oscar alvarez | 2a473e6a0a | |
oscar alvarez | 6b064bdd6d | |
oscar alvarez | bcd279311c |
|
@ -45,7 +45,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
<field name="text">Missing default values for workday or restday on configuration!</field>
|
<field name="text">Missing default values for workday or restday on configuration!</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="msg_invalid_formula">
|
<record model="ir.message" id="msg_invalid_formula">
|
||||||
<field name="text">Invalid formula [ %formula ] for unit price!</field>
|
<field name="text">Invalid formula "%(formula)s" for unit price!</field>
|
||||||
</record>
|
</record>
|
||||||
</data>
|
</data>
|
||||||
</tryton>
|
</tryton>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=6.0.6
|
version=6.0.8
|
||||||
depends:
|
depends:
|
||||||
party
|
party
|
||||||
currency
|
currency
|
||||||
|
|
|
@ -171,12 +171,13 @@ class WageType(ModelSQL, ModelView):
|
||||||
return Decimal('0.0')
|
return Decimal('0.0')
|
||||||
if args.get('salary') != None:
|
if args.get('salary') != None:
|
||||||
salary = float(args['salary'])
|
salary = float(args['salary'])
|
||||||
try:
|
print('formula ....', formula)
|
||||||
|
if 1: #try:
|
||||||
value = Decimal(str(round(eval(formula), 2)))
|
value = Decimal(str(round(eval(formula), 2)))
|
||||||
return value
|
return value
|
||||||
except Exception:
|
# except Exception:
|
||||||
raise WageTypeValidationError(
|
# raise WageTypeValidationError(
|
||||||
gettext('staff_payroll.msg_invalid_formula', formula=formula))
|
# gettext('staff_payroll.msg_invalid_formula', formula=formula))
|
||||||
|
|
||||||
|
|
||||||
class WageTypeSalary(ModelSQL):
|
class WageTypeSalary(ModelSQL):
|
||||||
|
|
Loading…
Reference in New Issue