diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-13 10:08:12 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-13 10:08:12 +0200 |
| commit | b2872e9bab5b84f7a83548d7ea0e864e4aa0d131 (patch) | |
| tree | 8cc57082fd3a1b307e76a46a51eca9a66d55e258 /addons/project_timesheet_holidays | |
| parent | 2f90b39a6689607f7b812e648dee966bb37c2190 (diff) | |
| parent | 499d3efa7ce4b7f6756658bff82e4a8b2f57c050 (diff) | |
[MERGE] forward port branch saas-12.3 up to 499d3efa7ce
Diffstat (limited to 'addons/project_timesheet_holidays')
| -rw-r--r-- | addons/project_timesheet_holidays/models/hr_holidays.py | 1 | ||||
| -rw-r--r-- | addons/project_timesheet_holidays/models/res_company.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/project_timesheet_holidays/models/hr_holidays.py b/addons/project_timesheet_holidays/models/hr_holidays.py index ada3b56acc1..e78420a0176 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, |