Compare commits

...

5 Commits

Author SHA1 Message Date
oscar alvarez 613cd46b2a Fix 2023-05-17 12:24:44 -05:00
oscar alvarez e11c7cfb09 Update version 2023-05-17 12:09:45 -05:00
oscar alvarez 2a473e6a0a Fix 2023-05-17 12:07:32 -05:00
oscar alvarez 6b064bdd6d Fix error 2023-05-17 12:04:35 -05:00
oscar alvarez bcd279311c Update version 2023-05-17 10:35:13 -05:00
3 changed files with 7 additions and 6 deletions

View File

@ -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>
</record>
<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>
</data>
</tryton>

View File

@ -1,5 +1,5 @@
[tryton]
version=6.0.6
version=6.0.8
depends:
party
currency

View File

@ -171,12 +171,13 @@ class WageType(ModelSQL, ModelView):
return Decimal('0.0')
if args.get('salary') != None:
salary = float(args['salary'])
try:
print('formula ....', formula)
if 1: #try:
value = Decimal(str(round(eval(formula), 2)))
return value
except Exception:
raise WageTypeValidationError(
gettext('staff_payroll.msg_invalid_formula', formula=formula))
# except Exception:
# raise WageTypeValidationError(
# gettext('staff_payroll.msg_invalid_formula', formula=formula))
class WageTypeSalary(ModelSQL):