diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py index 31c55774e..36a608298 100644 --- a/odex25_hr/attendances/models/hr_attendance_report.py +++ b/odex25_hr/attendances/models/hr_attendance_report.py @@ -253,8 +253,8 @@ class HrAttendanceReport(models.Model): '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)) + missing_punch_hours + 'total_deduction': ((missed_hours+ missing_punch_hours) * ( + employee.contract_id.total_allowance / working_hours_flexible_days)) } item_list.append(values) elif not emp_calendar.is_flexible: @@ -349,7 +349,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)+missing_punch_hours, + 'total_deduction': (get_total_hours + missing_punch_hours)* get_amount_per_hour, 'additional_hours': additional_hours, 'actual_absent_hours':actual_absent_hours, 'total_permission_hours':total_permission_hours,