diff --git a/yuthon_hr_attendance/models/duty_adjustment_schedule.py b/yuthon_hr_attendance/models/duty_adjustment_schedule.py index 359221ca5..ae9503687 100644 --- a/yuthon_hr_attendance/models/duty_adjustment_schedule.py +++ b/yuthon_hr_attendance/models/duty_adjustment_schedule.py @@ -60,7 +60,8 @@ class DutyAdjustmentSchedule(models.Model): over_record = self.env['vacation.over.line'].search([ ('employee_id', '=', record.employee_id.id), ('update_date', '=', record.duty_date), - ('vacation_id', '=', record.vacation_id.id) + ('vacation_id', '=', record.vacation_id.id), + ('text', '=', '值班调休'), ], limit=1) if not over_record: self.env['vacation.over.line'].create({ diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml index 490293708..ac8067716 100644 --- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml +++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml @@ -422,7 +422,7 @@ - + @@ -430,6 +430,7 @@ +