minor fix
This commit is contained in:
parent
eedb0180c9
commit
49873614e0
11
contract.py
11
contract.py
|
@ -51,7 +51,8 @@ class StaffContract(Workflow, ModelSQL, ModelView):
|
|||
('active', 'Active'),
|
||||
('finished', 'Finished'),
|
||||
], 'State', readonly=True, select=True)
|
||||
payment_term = fields.Selection(PAYMENT_TERM, 'Payment Term', states=STATES)
|
||||
payment_term = fields.Selection(
|
||||
PAYMENT_TERM, 'Payment Term', states=STATES)
|
||||
comment = fields.Text("Comment", states=STATES)
|
||||
position = fields.Many2One('staff.position', 'Position',
|
||||
select=True)
|
||||
|
@ -140,9 +141,7 @@ class StaffContract(Workflow, ModelSQL, ModelView):
|
|||
contract._check_finish_date()
|
||||
|
||||
def _check_finish_date(self):
|
||||
today = Pool().get('ir.date').today()
|
||||
if self.end_date and self.end_date > today:
|
||||
raise StaffContractError(gettext('finish_contract_out_date'))
|
||||
pass
|
||||
|
||||
def set_number(self):
|
||||
'''
|
||||
|
@ -155,7 +154,7 @@ class StaffContract(Workflow, ModelSQL, ModelView):
|
|||
if self.number:
|
||||
return
|
||||
if not config.staff_contract_sequence:
|
||||
raise StaffContractError(gettext('missing_contract_sequence'))
|
||||
raise StaffContractError(gettext('staff.msg_missing_contract_sequence'))
|
||||
number = config.staff_contract_sequence.get()
|
||||
self.write([self], {'number': number})
|
||||
|
||||
|
@ -168,6 +167,6 @@ class StaffContract(Workflow, ModelSQL, ModelView):
|
|||
('state', 'in', ('active', 'draft')),
|
||||
])
|
||||
if contracts_current:
|
||||
raise AccessError(gettext('employee_with_contract_current',
|
||||
raise AccessError(gettext('staff.msg_employee_with_contract_current',
|
||||
contract=contracts_current[0].employee.rec_name))
|
||||
return super(StaffContract, cls).create(vlist)
|
||||
|
|
Loading…
Reference in New Issue