Skip to content

Commit

Permalink
[FIX] hr_employee_service_contract: remove duplicate view
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-pelykh committed Dec 25, 2018
1 parent 034d268 commit 094115b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 50 deletions.
3 changes: 0 additions & 3 deletions hr_employee_service_contract/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@
'dateutil',
],
},
'data': [
'views/hr_employee.xml',
],
}
34 changes: 23 additions & 11 deletions hr_employee_service_contract/models/hr_employee.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,42 @@ class HrEmployee(models.Model):
def _compute_first_contract_id(self):
Contract = self.env['hr.contract']
for employee in self:
employee.first_contract_id = Contract.search([
('employee_id', '=', employee.id),
('state', 'not in', self._service_contract_states()),
], order='date_start asc', limit=1)
employee.first_contract_id = Contract.search(
employee._get_contract_filter(),
order='date_start asc',
limit=1
)

@api.multi
@api.depends('contract_ids')
def _compute_last_contract_id(self):
Contract = self.env['hr.contract']
for employee in self:
employee.last_contract_id = Contract.search([
('employee_id', '=', employee.id),
('state', 'not in', self._service_contract_states()),
], order='date_end desc', limit=1)
employee.last_contract_id = Contract.search(
employee._get_contract_filter(),
order='date_end desc',
limit=1
)

@api.multi
@api.onchange('service_hire_date')
def _onchange_service_hire_date(self): # pragma: no cover
# Do nothing
pass

@api.multi
def _get_contract_filter(self):
self.ensure_one()

return [
('employee_id', '=', self.id),
('state', 'in', self._get_service_contract_states()),
]

@api.model
def _service_contract_states(self):
def _get_service_contract_states(self):
return [
'draft',
'cancel',
'open',
'pending',
'close',
]
36 changes: 0 additions & 36 deletions hr_employee_service_contract/views/hr_employee.xml

This file was deleted.

0 comments on commit 094115b

Please sign in to comment.