fix decimal hours in workdaydefinition
This commit is contained in:
parent
a3e511b7de
commit
bc51610b8f
|
@ -18,7 +18,7 @@ from .exceptions import (PayrollDeleteError, PayrollPeriodCloseError,
|
||||||
|
|
||||||
STATES = {'readonly': (Eval('state') != 'draft')}
|
STATES = {'readonly': (Eval('state') != 'draft')}
|
||||||
|
|
||||||
_DEFAULT_WORK_DAY = 8
|
_DEFAULT_WORK_DAY = 7.8336
|
||||||
|
|
||||||
_ZERO = Decimal('0.0')
|
_ZERO = Decimal('0.0')
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ class WorkdayDefinition(ModelSQL, ModelView):
|
||||||
__name__ = 'staff.workday_definition'
|
__name__ = 'staff.workday_definition'
|
||||||
position = fields.Many2One('staff.position', 'Position',
|
position = fields.Many2One('staff.position', 'Position',
|
||||||
required=True, ondelete='CASCADE')
|
required=True, ondelete='CASCADE')
|
||||||
workday = fields.Numeric('Workday', digits=(2, 2), required=True)
|
workday = fields.Numeric('Workday', digits=(6, 4), required=True)
|
||||||
restday = fields.Numeric('Restday', digits=(2, 2), required=True)
|
restday = fields.Numeric('Restday', digits=(2, 2), required=True)
|
||||||
weekday = fields.Selection([
|
weekday = fields.Selection([
|
||||||
('monday', 'Monday'),
|
('monday', 'Monday'),
|
||||||
|
|
Loading…
Reference in New Issue