From 3f46aadb14affee945ca2c414ee80afb3ee0302a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sun, 19 Apr 2026 15:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/vacation_overtime_active.py | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py index 24322bb37..97280396a 100644 --- a/yuthon_hr_attendance/models/vacation_overtime_active.py +++ b/yuthon_hr_attendance/models/vacation_overtime_active.py @@ -135,23 +135,15 @@ class VacationOvertimeActive(models.Model): def revoke(self): self.ensure_one() self.select_revoke = 'done' - domain1 = [ - ('employee_id', '=', self.employee_id.id), - ('carry_forward_date', '=', self.carry_forward_date) - ] - active_line_ids = self.env['overtime.active.line'].search(domain1) - if active_line_ids: - for active_line_id in active_line_ids: - active_line_id.is_void = True - carryover_id = self.env['overtime.carryover'].search([ - ('carry_forward_date', '=', self.carry_forward_date), - ('employee_id', '=', self.employee_id.id), - ('is_void', '!=', False), - ('carryover_type', '=', 'fee'),]) - if carryover_id: - carryover_id.is_void = True - carryover_id.over_line_id._compute_carry_forward_info() - carryover_id.text = '归档撤销' + carryover_id = self.env['overtime.carryover'].search([ + ('carry_forward_date', '=', self.carry_forward_date), + ('employee_id', '=', self.employee_id.id), + ('is_void', '!=', False), + ('carryover_type', '=', 'fee'),]) + if carryover_id: + carryover_id.is_void = True + carryover_id.over_line_id._compute_carry_forward_info() + carryover_id.text = '归档撤销' report_id = self.env['yuthon.vacation.reports'].search([ ('employee_id', '=', self.employee_id.id),