diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index 764de7add..e2e9bdba3 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -430,7 +430,8 @@ class YuthonVacationReports(models.Model): if inherit_overtime_lines: inherit_over_update_lines = inherit_overtime_lines.workday + inherit_overtime_lines.public_holidays rec.dynamic_previous_year1 = inherit_over_update_lines / 8 # 初始补休上年剩余 - rec.last_workday = inherit_over_update_lines / 8 - rec.last_holiday if rec.last_holiday else inherit_over_update_lines / 8 + rec.last_workday = inherit_overtime_lines.workday / 8 + rec.last_holiday = inherit_overtime_lines.public_holidays / 8 # 3. 筛选overtime_ids中workflow_record_id有值且update_type="增加"的明细,计算总增加额 over_increase_lines = rec.overtime_ids.filtered(