devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5892 from expsa/bakry_hr 

fix
This commit is contained in:
bakry 2025-12-30 16:04:18 +03:00 committed by GitHub
parent 4d57cd08c6 8375fd6dec
commit 525fa69176
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
odex25_hr/attendances/models/hr_attendance.py
View File

@ -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([