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 #5434 from expsa/kch_dev_odex25_hr 

[FIX] attendances: FIX bug
This commit is contained in:
kchyounes19 2025-11-17 15:17:16 +01:00 committed by GitHub
parent ea38d1cc08 97ebed566b
commit a46ba1e3e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,8 +342,10 @@ class HrAttendanceReport(models.Model):
lateness + early_exist + extra_break_duration + total_absent) - lateness_hours_by_hr
else:
get_total_hours = (total_absent - lateness_hours_by_hr)
#print("_____________________________________get_total_hours",total_absent,lateness_hours_by_hr)
if get_total_hours < 0:
get_total_hours = 0
print("_____________________________________get_total_hours", get_total_hours)
if attendance.employee_id.contract_id.state == 'program_directory':
get_total_amount = attendance.employee_id.contract_id.total_allowance
if emp_calendar.is_full_day:
@ -397,8 +399,7 @@ class HrAttendanceReport(models.Model):
temp_dict["exist_hours"] = sum(item1["exist_hours"] for item1 in grp4)
temp_dict["extra_break_duration"] = sum(item1["extra_break_duration"] for item1 in grp5)
temp_dict["absent_days_by_hr"] = sum(item1["absent_days_by_hr"] for item1 in grp6)
temp_dict["total_hours"] = sum(item["total_hours"] for item in grp7) - (
temp_dict["leave"] + temp_dict["mission_by_days"])
temp_dict["total_hours"] = temp_dict["absent"] - temp_dict["absent_days_by_hr"]
temp_dict["dummy_field"] = sum(item["dummy_field"] for item in grp13)
temp_dict["total_amount"] = sum(item["total_amount"] for item in grp8) / len(list(grp9))
temp_dict["amount_per_hour"] = sum(item["amount_per_hour"] for item in grp10) / len(list(grp11))