[FIX] project_timesheet_holidays: multi company issues

Partial backport of ef1afb7 Task-1999686 Closes odoo#35520 closes odoo#35526 Signed-off-by: Christophe Simonis <[email protected]>
honsa · Aug 7, 2019 · 5d64a51 · 5d64a51
1 parent 752b255
commit 5d64a51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/addons/project_timesheet_holidays/models/hr_holidays.py b/addons/project_timesheet_holidays/models/hr_holidays.py
@@ -83,6 +83,7 @@ def _validate_leave_request(self):
                     '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
@@ -40,7 +40,7 @@ def _create_leave_project_task(self):
                     '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,