diff --git a/calicut_textiles/public/python/payroll_entry.py b/calicut_textiles/public/python/payroll_entry.py index 3aacbb7..94fa94a 100644 --- a/calicut_textiles/public/python/payroll_entry.py +++ b/calicut_textiles/public/python/payroll_entry.py @@ -221,6 +221,7 @@ def create_overtime(pe, employees, employee_map, checkin_map, holiday_map): total_ot_minutes = 0 total_early_minutes = 0 + total_late_minutes = 0 for date, rows in checkin_map.get(emp, {}).items(): times = filter_noise([r.time for r in rows]) @@ -255,8 +256,6 @@ def create_overtime(pe, employees, employee_map, checkin_map, holiday_map): total_ot_minutes += threshold + minutes(out_time - normal_end) # --------- LATE / EARLY (NON-HOLIDAY ONLY) --------- - total_late_minutes = 0 - total_early_minutes = 0 for row in rows: custom_late_coming_minutes = row.custom_late_coming_minutes if row.custom_late_coming_minutes else 0 custom_early_going_minutes = row.custom_early_going_minutes if row.custom_early_going_minutes else 0 @@ -286,13 +285,13 @@ def create_overtime(pe, employees, employee_map, checkin_map, holiday_map): round(rate * total_ot_minutes, 2), ot_component ) - total_early_minutes_late = total_early_minutes + total_late_minutes - if total_early_minutes_late > 0: + total_early_late_minutes = total_early_minutes + total_late_minutes + if total_early_late_minutes > 0: create_monthly_overtime( emp, pe.end_date, - total_early_minutes_late, - round(rate * total_early_minutes_late, 2), + total_early_late_minutes, + round(rate * total_early_late_minutes, 2), early_component )