fix
This commit is contained in:
parent
ee9f586322
commit
8375fd6dec
|
|
@ -493,18 +493,21 @@ class Attendance(models.Model):
|
||||||
Module = self.env['ir.module.module'].sudo()
|
Module = self.env['ir.module.module'].sudo()
|
||||||
mod_emp_request = Module.search([('state', '=', 'installed'), ('name', '=', 'employee_requests')])
|
mod_emp_request = Module.search([('state', '=', 'installed'), ('name', '=', 'employee_requests')])
|
||||||
modules_mission = Module.search([('state', '=', 'installed'), ('name', '=', 'exp_official_mission')])
|
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([
|
if modules_holiday:
|
||||||
('employee_id', '=', record.employee_id.id),
|
|
||||||
('date_from', '<=', record.action_date),
|
|
||||||
('date_to', '>=', record.action_date),('state','=','validate1'),])
|
|
||||||
|
|
||||||
official_holiday = self.env['hr.holiday.officials'].search([
|
holiday = self.env['hr.holidays'].search([
|
||||||
('date_from', '<=', record.action_date),
|
('employee_id', '=', record.employee_id.id),
|
||||||
('date_to', '>=', record.action_date),('state','=','confirm'),])
|
('date_from', '<=', record.action_date),
|
||||||
|
('date_to', '>=', record.action_date),('state','=','validate1'),])
|
||||||
|
|
||||||
if holiday or official_holiday:
|
official_holiday = self.env['hr.holiday.officials'].search([
|
||||||
record.is_holiday= True
|
('date_from', '<=', record.action_date),
|
||||||
|
('date_to', '>=', record.action_date),('state','=','confirm'),])
|
||||||
|
|
||||||
|
if holiday or official_holiday:
|
||||||
|
record.is_holiday= True
|
||||||
|
|
||||||
if modules_mission:
|
if modules_mission:
|
||||||
missions = self.env['hr.official.mission.employee'].search([
|
missions = self.env['hr.official.mission.employee'].search([
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue