From 0a81fb1456dec16bf56742a4718f16c14fde2d07 Mon Sep 17 00:00:00 2001 From: mohammed-alkhazrji Date: Wed, 28 May 2025 15:08:45 +0300 Subject: [PATCH] fix punch calc --- odex25_hr/attendances/models/hr_attendance_report.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py index a58e4807e..09e90c4ac 100644 --- a/odex25_hr/attendances/models/hr_attendance_report.py +++ b/odex25_hr/attendances/models/hr_attendance_report.py @@ -127,7 +127,11 @@ class HrAttendanceReport(models.Model): missed_hours = planed_hours - working_hours missing_punch_transactions = transactions.filtered( - lambda t: (t.sign_in and not t.sign_out) or (not t.sign_in and t.sign_out) + lambda t: ( + (t.sign_in and not t.sign_out) or + (not t.sign_in and t.sign_out) or + (not t.sign_in and not t.sign_out and t.office_hours > 0) + ) ) missing_punch_hours = sum([ @@ -222,7 +226,7 @@ class HrAttendanceReport(models.Model): 'dummy_field': missed_hours, 'actual_absent_hours': actual_absent_hours, 'total_permission_hours':total_permission_hours, - 'missing_punch_hours':missing_punch_hours + total_mission, + 'missing_punch_hours':missing_punch_hours , 'total_amount': employee.contract_id.total_allowance, 'amount_per_hour': employee.contract_id.total_allowance / working_hours_flexible_days, 'total_deduction': missed_hours * ( @@ -313,7 +317,7 @@ class HrAttendanceReport(models.Model): 'additional_hours': additional_hours, 'actual_absent_hours':actual_absent_hours, 'total_permission_hours':total_permission_hours, - 'missing_punch_hours':missing_punch_hours + total_absent + 'missing_punch_hours':missing_punch_hours } item_list.append(values) from itertools import groupby, tee