diff --git a/odex25_hr/attendances/models/hr_attendance.py b/odex25_hr/attendances/models/hr_attendance.py index 67698f495..bccec43b5 100644 --- a/odex25_hr/attendances/models/hr_attendance.py +++ b/odex25_hr/attendances/models/hr_attendance.py @@ -493,18 +493,21 @@ class Attendance(models.Model): Module = self.env['ir.module.module'].sudo() mod_emp_request = Module.search([('state', '=', 'installed'), ('name', '=', 'employee_requests')]) modules_mission = Module.search([('state', '=', 'installed'), ('name', '=', 'exp_official_mission')]) + modules_holiday = Module.search([('state', '=', 'installed'), ('name', '=', 'hr_holidays_public')]) - holiday = self.env['hr.holidays'].search([ - ('employee_id', '=', record.employee_id.id), - ('date_from', '<=', record.action_date), - ('date_to', '>=', record.action_date),('state','=','validate1'),]) + if modules_holiday: - official_holiday = self.env['hr.holiday.officials'].search([ - ('date_from', '<=', record.action_date), - ('date_to', '>=', record.action_date),('state','=','confirm'),]) + holiday = self.env['hr.holidays'].search([ + ('employee_id', '=', record.employee_id.id), + ('date_from', '<=', record.action_date), + ('date_to', '>=', record.action_date),('state','=','validate1'),]) - if holiday or official_holiday: - record.is_holiday= True + official_holiday = self.env['hr.holiday.officials'].search([ + ('date_from', '<=', record.action_date), + ('date_to', '>=', record.action_date),('state','=','confirm'),]) + + if holiday or official_holiday: + record.is_holiday= True if modules_mission: missions = self.env['hr.official.mission.employee'].search([