From 94bbffe46bebba117d80eded2a9160b3ab7c0ba3 Mon Sep 17 00:00:00 2001 From: sofiagvaladze Date: Fri, 24 Feb 2023 13:49:16 +0000 Subject: [PATCH] [IMP] add domain to select current company calendar Before this commit user was able to select calendars from differant companies even though user is not allowed to read that companies record. This commit add field related to country company and use it in a domain to restrict user to select on availble calendars. task-3078009 closes odoo/odoo#109904 Related: odoo/enterprise#37334 Signed-off-by: Kevin Baptiste --- addons/hr_contract/models/hr_payroll_structure_type.py | 2 +- addons/hr_contract/models/resource.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_contract/models/hr_payroll_structure_type.py b/addons/hr_contract/models/hr_payroll_structure_type.py index d021d7ef2c6..ef5a7bd84bb 100644 --- a/addons/hr_contract/models/hr_payroll_structure_type.py +++ b/addons/hr_contract/models/hr_payroll_structure_type.py @@ -11,5 +11,5 @@ class HrPayrollStructureType(models.Model): name = fields.Char('Salary Structure Type') default_resource_calendar_id = fields.Many2one( 'resource.calendar', 'Default Working Hours', - default=lambda self: self.env.company.resource_calendar_id) + default=lambda self: self.env.company.resource_calendar_id if self.env.company.country_id else False) country_id = fields.Many2one('res.country', string='Country', default=lambda self: self.env.company.country_id) diff --git a/addons/hr_contract/models/resource.py b/addons/hr_contract/models/resource.py index 52316b92636..c3f1b427453 100644 --- a/addons/hr_contract/models/resource.py +++ b/addons/hr_contract/models/resource.py @@ -10,6 +10,7 @@ class ResourceCalendar(models.Model): _inherit = 'resource.calendar' contracts_count = fields.Integer("# Contracts using it", compute='_compute_contracts_count', groups="hr_contract.group_hr_contract_manager") + company_country_id = fields.Many2one('res.country', string='Country', related='company_id.partner_id.country_id') def transfer_leaves_to(self, other_calendar, resources=None, from_date=None): """