commit
5bdf287629
|
|
@ -362,7 +362,7 @@ class HrAttendanceReport(models.Model):
|
|||
'dummy_field': get_total_hours,
|
||||
'total_amount': get_total_amount,
|
||||
'amount_per_hour': get_amount_per_hour,
|
||||
'total_deduction': get_total_hours * get_amount_per_hour,
|
||||
'total_deduction': (get_total_hours)* get_amount_per_hour,
|
||||
'additional_hours': additional_hours,
|
||||
'actual_absent_hours':actual_absent_hours,
|
||||
'total_permission_hours':total_permission_hours,
|
||||
|
|
@ -397,7 +397,7 @@ class HrAttendanceReport(models.Model):
|
|||
|
||||
############# re chick total_deduction
|
||||
|
||||
temp_dict["total_deduction"] = temp_dict["absent"]*temp_dict["amount_per_hour"]
|
||||
temp_dict["total_deduction"] = temp_dict["total_hours"]*temp_dict["amount_per_hour"]
|
||||
#temp_dict["total_deduction"] = sum(item["total_deduction"] for item in grp12)
|
||||
temp_dict["additional_hours"] = sum(item["additional_hours"] for item in grp15)
|
||||
result.append(temp_dict)
|
||||
|
|
|
|||
Loading…
Reference in New Issue