diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index da63a16f7..43c368d5c 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -28,7 +28,7 @@ class YuthonVacationReports(models.Model): done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 3), store=True, group_operator=None) leave = fields.Float(string='剩余年假', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None) - working_overtime = fields.Float(string='剩余加班时', compute='_compute_working_overtime', store=True, + working_overtime = fields.Float(string='剩余补休', compute='_compute_working_overtime', store=True, digits=(16, 3), group_operator=None) meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True, group_operator=None) medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True, group_operator=None) @@ -36,7 +36,7 @@ class YuthonVacationReports(models.Model): leave_of_absence = fields.Float(string="事假", digits=(16, 3), compute='_compute_other_leave', store=True, group_operator=None) statutory_leave = fields.Integer(string="加班时(法定)", compute='_compute_other_leave', store=True, group_operator=None) - cop_leave = fields.Float(string='补休', digits=(16, 3), compute='_compute_other_leave', store=True, + cop_leave = fields.Float(string='补休', digits=(16, 3), store=True, compute='_compute_working_overtime', group_operator=None) duty_off_leave = fields.Integer(string='值班调休', compute='_compute_other_leave', store=True, group_operator=None) marriage_leave = fields.Integer(string='婚假', compute='_compute_other_leave', store=True, group_operator=None) @@ -514,8 +514,8 @@ class YuthonVacationReports(models.Model): line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0) if line.update_type == 'add': total_add += line_total - elif line.update_type == 'reduce': total_reduce += line_total + elif line.update_type == 'reduce': total_add -= line_total done_working_overtime += line_total record.working_overtime = max(total_add / 8, 0)