Presik
/
trytonpsk-staff
mirror of https://bitbucket.org/presik/trytonpsk-staff.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fix

This commit is contained in:
wilson gomez 2021-11-05 17:44:31 -05:00
parent eedb0180c9
commit 49873614e0
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contract.py
View File

@ -26,18 +26,18 @@ class StaffContract(Workflow, ModelSQL, ModelView):
_rec_name = 'number'
number = fields.Char('Number', select=True, states=STATES)
employee = fields.Many2One('company.employee', 'Employee',
select=True, required=True, states=STATES)
select=True, required=True, states=STATES)
company = fields.Many2One('company.company', 'Company', required=True,
select=True, states=STATES)
select=True, states=STATES)
contract_date = fields.Date('Contract Date', required=True,
states=STATES)
states=STATES)
start_date = fields.Date('Start Contract', required=True, states=STATES)
end_date = fields.Date('End Contract', states={
'required': Eval('state') == 'finished',
'readonly': Eval('state') == 'finished',
}, depends=['state'])
salary = fields.Numeric('Salary', digits=(16, 2), states=STATES,
help='Salary monthly of person', required=True)
help='Salary monthly of person', required=True)
kind = fields.Selection([
('steady', 'Steady'),
('indefinite', 'Indefinite'),
@ -51,10 +51,11 @@ 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)
select=True)
@classmethod
def __setup__(cls):
@ -115,9 +116,9 @@ class StaffContract(Workflow, ModelSQL, ModelView):
else:
bool_op = 'OR'
return [bool_op,
('number',) + tuple(clause[1:]),
('employee',) + tuple(clause[1:]),
]
('number',) + tuple(clause[1:]),
('employee',) + tuple(clause[1:]),
]
@classmethod
@ModelView.button
@ -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',
contract=contracts_current[0].employee.rec_name))
raise AccessError(gettext('staff.msg_employee_with_contract_current',
contract=contracts_current[0].employee.rec_name))
return super(StaffContract, cls).create(vlist)