From 8444643cc6ddbf47a80316eba7717b1c616e245f Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 23 Mar 2021 13:40:53 +0000 Subject: [PATCH] [FIX] hr_contract: Allow manager to modify current employee contract closes odoo/odoo#68259 X-original-commit: c60672e123e996a82a706a8aed5456ddd2288578 Related: odoo/enterprise#17259 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_contract/models/hr_employee.py | 5 +++-- addons/hr_contract/views/hr_contract_views.xml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/hr_contract/models/hr_employee.py b/addons/hr_contract/models/hr_employee.py index a12567387e6..3cc3ab03e7f 100644 --- a/addons/hr_contract/models/hr_employee.py +++ b/addons/hr_contract/models/hr_employee.py @@ -10,8 +10,9 @@ class Employee(models.Model): vehicle = fields.Char(string='Company Vehicle', groups="hr.group_hr_user") contract_ids = fields.One2many('hr.contract', 'employee_id', string='Employee Contracts') - contract_id = fields.Many2one('hr.contract', string='Current Contract', - groups="hr.group_hr_user",domain="[('company_id', '=', company_id)]", help='Current contract of the employee') + contract_id = fields.Many2one( + 'hr.contract', string='Current Contract', groups="hr.group_hr_user", + domain="[('company_id', '=', company_id), ('employee_id', '=', id)]", help='Current contract of the employee') calendar_mismatch = fields.Boolean(related='contract_id.calendar_mismatch') contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contract Count') contract_warning = fields.Boolean(string='Contract Warning', store=True, compute='_compute_contract_warning', groups="hr.group_hr_user") diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 6f19eb002b0..796047ebb4a 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -58,6 +58,9 @@ + + +