calc right missing
This commit is contained in:
parent
1e0e0d64cc
commit
39fe6f67f6
|
|
@ -246,15 +246,15 @@ class HrAttendanceReport(models.Model):
|
|||
'absent': actual_absent_hours + missing_punch_hours + break_hours + early_exit_hours + lateness_hours ,
|
||||
'mission_by_days': total_mission,
|
||||
'absent_days_by_hr': 0.0,
|
||||
'total_hours': missed_hours,
|
||||
'total_hours': missed_hours + missing_punch_hours,
|
||||
'dummy_field': missed_hours,
|
||||
'actual_absent_hours': actual_absent_hours,
|
||||
'total_permission_hours':total_permission_hours,
|
||||
'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 * (
|
||||
employee.contract_id.total_allowance / working_hours_flexible_days)
|
||||
'total_deduction': (missed_hours * (
|
||||
employee.contract_id.total_allowance / working_hours_flexible_days)) + missing_punch_hours
|
||||
}
|
||||
item_list.append(values)
|
||||
elif not emp_calendar.is_flexible:
|
||||
|
|
@ -345,11 +345,11 @@ class HrAttendanceReport(models.Model):
|
|||
'absent': actual_absent_hours + missing_punch_hours + lateness + early_exist + extra_break_duration,
|
||||
'mission_by_days': total_mission_by_day,
|
||||
'absent_days_by_hr': lateness_hours_by_hr,
|
||||
'total_hours': get_total_hours,
|
||||
'total_hours': get_total_hours + missing_punch_hours,
|
||||
'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)+missing_punch_hours,
|
||||
'additional_hours': additional_hours,
|
||||
'actual_absent_hours':actual_absent_hours,
|
||||
'total_permission_hours':total_permission_hours,
|
||||
|
|
|
|||
Loading…
Reference in New Issue