diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py index 53f9ffba8e7..babad933990 100644 --- a/addons/hr_holidays/__manifest__.py +++ b/addons/hr_holidays/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Time Off', - 'version': '1.5', + 'version': '1.6', 'category': 'Human Resources/Time Off', 'sequence': 85, 'summary': 'Allocate PTOs and follow leaves requests', diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index 43a24e45e01..cceea130987 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -141,7 +141,14 @@ Time Off: multi company global rule - ['|', ('holiday_status_id.company_id', '=', False), ('holiday_status_id.company_id', 'in', company_ids)] + [ + '|', + ('employee_id', '=', False), + ('employee_id.company_id', 'in', company_ids), + '|', + ('holiday_status_id.company_id', '=', False), + ('holiday_status_id.company_id', 'in', company_ids) + ] diff --git a/addons/hr_holidays/upgrades/1.6/pre-migrate.py b/addons/hr_holidays/upgrades/1.6/pre-migrate.py new file mode 100644 index 00000000000..33540697730 --- /dev/null +++ b/addons/hr_holidays/upgrades/1.6/pre-migrate.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +def migrate(cr, version): + cr.execute(""" + UPDATE ir_rule r + SET domain_force = '["|", ("employee_id", "=", False), ("employee_id.company_id", "in", company_ids), "|", ("holiday_status_id.company_id", "=", False), ("holiday_status_id.company_id", "in", company_ids)]' + FROM ir_model_data d + WHERE d.res_id = r.id + AND d.model = 'ir.rule' + AND d.module = 'hr_holidays' + AND d.name = 'hr_leave_allocation_rule_multicompany' + """)