From 9267fca8813d8285a85f5e9510f1b5672bbf85f9 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 22 May 2017 19:33:14 +0200 Subject: [PATCH] Multi-company fixes in hr_holidays_usability --- hr_holidays_usability/wizard/hr_holidays_mass_allocation.py | 4 +++- hr_holidays_usability/wizard/hr_holidays_post.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py b/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py index 94d1039..9dce845 100644 --- a/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py +++ b/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py @@ -14,7 +14,9 @@ class HrHolidaysMassAllocation(models.TransientModel): @api.model def _default_employees(self): return self.env['hr.employee'].search([ - ('holiday_exclude_mass_allocation', '=', False)]) + ('holiday_exclude_mass_allocation', '=', False), + ('company_id', '=', self.env.user.company_id.id), + ]) @api.model def _get_default_holiday_status(self): diff --git a/hr_holidays_usability/wizard/hr_holidays_post.py b/hr_holidays_usability/wizard/hr_holidays_post.py index b178152..886c3b5 100644 --- a/hr_holidays_usability/wizard/hr_holidays_post.py +++ b/hr_holidays_usability/wizard/hr_holidays_post.py @@ -39,6 +39,7 @@ class HrHolidaysPost(models.TransientModel): ('state', '=', 'validate'), ('posted_date', '=', False), ('vacation_date_to', '<=', self.before_date), + ('company_id', '=', self.env.user.company_id.id), ]) self.write({ 'state': 'done',