From d68696e11e4b0f1d3a75830012c72a5fc17cbe76 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 11 Oct 2023 14:24:16 +0200 Subject: [PATCH] [IMP] hr: Make work address computed before save closes odoo/odoo#138381 Related: odoo/enterprise#48295 Signed-off-by: Yannick Tivisse (yti) --- addons/hr/models/hr_employee_base.py | 8 +++++++- addons/resource/models/resource_mixin.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/hr/models/hr_employee_base.py b/addons/hr/models/hr_employee_base.py index 276fa45316b..23e0e130a92 100644 --- a/addons/hr/models/hr_employee_base.py +++ b/addons/hr/models/hr_employee_base.py @@ -25,7 +25,13 @@ class HrEmployeeBase(models.AbstractModel): job_id = fields.Many2one('hr.job', 'Job Position', check_company=True) job_title = fields.Char("Job Title", compute="_compute_job_title", store=True, readonly=False) company_id = fields.Many2one('res.company', 'Company') - address_id = fields.Many2one('res.partner', 'Work Address', compute="_compute_address_id", store=True, readonly=False, + address_id = fields.Many2one( + 'res.partner', + string='Work Address', + compute="_compute_address_id", + precompute=True, + store=True, + readonly=False, check_company=True) work_phone = fields.Char('Work Phone', compute="_compute_phones", store=True, readonly=False) mobile_phone = fields.Char('Work Mobile', compute="_compute_work_contact_details", store=True, inverse='_inverse_work_contact_details') diff --git a/addons/resource/models/resource_mixin.py b/addons/resource/models/resource_mixin.py index d7c4b7c4e11..c64e1a8b664 100644 --- a/addons/resource/models/resource_mixin.py +++ b/addons/resource/models/resource_mixin.py @@ -18,7 +18,7 @@ class ResourceMixin(models.AbstractModel): company_id = fields.Many2one( 'res.company', 'Company', default=lambda self: self.env.company, - index=True, related='resource_id.company_id', store=True, readonly=False) + index=True, related='resource_id.company_id', precompute=True, store=True, readonly=False) resource_calendar_id = fields.Many2one( 'resource.calendar', 'Working Hours', default=lambda self: self.env.company.resource_calendar_id,