From 5d64a5114e9e2440cfa79a58961e29333fcf7751 Mon Sep 17 00:00:00 2001 From: jem-odoo Date: Wed, 7 Aug 2019 09:03:04 +0000 Subject: [FIX] project_timesheet_holidays: multi company issues Partial backport of ef1afb7b69610fa3ff783751ee544d7a0d020841 Task-1999686 Closes #35520 closes odoo/odoo#35526 Signed-off-by: Christophe Simonis --- addons/project_timesheet_holidays/models/hr_holidays.py | 1 + addons/project_timesheet_holidays/models/res_company.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/project_timesheet_holidays') diff --git a/addons/project_timesheet_holidays/models/hr_holidays.py b/addons/project_timesheet_holidays/models/hr_holidays.py index 3671df364e0..5dee00296c2 100644 --- a/addons/project_timesheet_holidays/models/hr_holidays.py +++ b/addons/project_timesheet_holidays/models/hr_holidays.py @@ -83,6 +83,7 @@ class Holidays(models.Model): 'date': fields.Date.to_string(day_date), 'holiday_id': holiday.id, 'employee_id': holiday.employee_id.id, + 'company_id': holiday_task.company_id.id or holiday_project.company_id.id, }) return super(Holidays, self)._validate_leave_request() diff --git a/addons/project_timesheet_holidays/models/res_company.py b/addons/project_timesheet_holidays/models/res_company.py index 948b4f3bffa..4ec9bcf4e19 100644 --- a/addons/project_timesheet_holidays/models/res_company.py +++ b/addons/project_timesheet_holidays/models/res_company.py @@ -40,7 +40,7 @@ class Company(models.Model): 'name': _('Time Off'), 'project_id': company.leave_timesheet_project_id.id, 'active': False, - 'company_id': False, + 'company_id': company.id, }) company.write({ 'leave_timesheet_task_id': task.id, -- cgit v1.2.3