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 #4269 from expsa/younes_dev_odex25_hr 

Fix bug
This commit is contained in:
kchyounes19 2025-08-20 13:59:37 +01:00 committed by GitHub
parent 347a570c94 cda392d5a0
commit 6bc5a97534
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
odex25_hr/attendances/models/hr_attendance_report.py
View File

@ -319,12 +319,14 @@ class HrAttendanceReport(models.Model):
total_absent += attendance.plan_hours
if attendance.calendar_id.is_full_day:
total_absent += attendance.calendar_id.break_duration
if lateness_reasons:
lateness_hours_by_hr += attendance.plan_hours + attendance.calendar_id.break_duration
elif attendance.sequence == 1:
total_absent += attendance.calendar_id.shift_one_break_duration
if lateness_reasons:
lateness_hours_by_hr += attendance.plan_hours + attendance.calendar_id.shift_one_break_duration
elif attendance.sequence == 2:
total_absent += attendance.calendar_id.shift_two_break_duration
if lateness_reasons:
lateness_hours_by_hr += total_absent
else:
working_hours = total_permission + total_mission_by_hour + hours + attendance.carried_hours
absence_hours = attendance.plan_hours - working_hours

4
odex25_hr/attendances/models/hr_reasons_lateness.py
View File

@ -86,13 +86,13 @@ class HrReasonsLateness(models.Model):
def action_open_related_attendance_transaction(self):
hr_attendance_transaction = self.env['hr.attendance.transaction'].search(
[('employee_id', '=', self.employee_id.id), ('date', '=', self.latest_date),('sequence','=',1)],limit=1).ids
[('employee_id', '=', self.employee_id.id), ('date', '=', self.latest_date),('sequence','=',1)],limit=1)
action = {
'type': 'ir.actions.act_window',
'name': _('Attendance Transaction'),
'res_model': 'hr.attendance.transaction',
'view_mode': 'form',
'domain': [('id', 'in', hr_attendance_transaction)],
'domain': [('id', '=', hr_attendance_transaction.id)],
'target': 'current',
}
return action