diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 5789bee8aba..add502f82fb 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -603,7 +603,7 @@ class HolidaysRequest(models.Model): by creating a calendar event and a resource time off. """ holidays = self.filtered(lambda request: request.holiday_type == 'employee') holidays._create_resource_leave() - for holiday in holidays: + for holiday in holidays.filtered(lambda l: l.holiday_status_id.create_calendar_meeting): meeting_values = holiday._prepare_holidays_meeting_values() meeting = self.env['calendar.event'].with_context(no_mail_to_attendees=True).create(meeting_values) holiday.write({'meeting_id': meeting.id}) @@ -614,8 +614,6 @@ class HolidaysRequest(models.Model): calendar = self.employee_id.resource_calendar_id or self.env.company.resource_calendar_id meeting_values = { 'name': self.display_name, - 'categ_ids': [(6, 0, [ - self.holiday_status_id.categ_id.id])] if self.holiday_status_id.categ_id else [], 'duration': self.number_of_days * (calendar.hours_per_day or HOURS_PER_DAY), 'description': self.notes, 'user_id': self.user_id.id, diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index 1fb529ff390..577c159d671 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -26,9 +26,7 @@ class HolidaysType(models.Model): code = fields.Char('Code') sequence = fields.Integer(default=100, help='The type with the smallest sequence is the default value in time off request') - categ_id = fields.Many2one( - 'calendar.event.type', string='Meeting Type', - help='Once a time off is validated, Odoo will create a corresponding meeting of this type in the calendar.') + create_calendar_meeting = fields.Boolean(string="Display Time Off in Calendar", default=True) color_name = fields.Selection([ ('red', 'Red'), ('blue', 'Blue'), diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml index 1c0b02abd1b..8406c7561e1 100644 --- a/addons/hr_holidays/views/hr_leave_type_views.xml +++ b/addons/hr_holidays/views/hr_leave_type_views.xml @@ -8,7 +8,7 @@ - + @@ -70,7 +70,7 @@ - +