From a6d6028c3519a784a05c404d53b5450376a3a599 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: Wed, 15 Apr 2026 17:58:58 +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

---
 yuthon_hr_attendance/models/overtime_carryover.py       | 2 ++
 yuthon_hr_attendance/models/vacation_overtime_active.py | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/yuthon_hr_attendance/models/overtime_carryover.py b/yuthon_hr_attendance/models/overtime_carryover.py
index 697b054b1..4beb9cebd 100644
--- a/yuthon_hr_attendance/models/overtime_carryover.py
+++ b/yuthon_hr_attendance/models/overtime_carryover.py
@@ -7,6 +7,8 @@ class OvertimeCarryover(models.Model):
     _name = 'overtime.carryover'
     _description = '加班结转明细'
 
+
+
     over_line_id = fields.Many2one('vacation.over.line', string='加班记录(结转)')
     over_line_id1 = fields.Many2one('vacation.over.line', string='加班记录(销假)')
     carry_forward_date = fields.Date(string="结转日期")
diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py
index 0fc73ad6e..ff4e7284d 100644
--- a/yuthon_hr_attendance/models/vacation_overtime_active.py
+++ b/yuthon_hr_attendance/models/vacation_overtime_active.py
@@ -165,13 +165,15 @@ class VacationOvertimeActive(models.Model):
     def open_record(self):
         self.ensure_one()
         domain = [
-            ('employee_id', '=', self.employee_id.id),
-            ('carry_forward_date', '=', self.carry_forward_date)
+            ('over_line_id.vacation_id.employee_id', '=', self.employee_id.id),
+            ('carryover_type', '=', 'fee'),
+            ('carry_forward_date', '=', self.carry_forward_date),
+            ('is_void', '=', False)
         ]
         return {
             'name': f'加班明细',
             'type': 'ir.actions.act_window',
-            'res_model': 'overtime.active.line',
+            'res_model': 'overtime.carryover',
             'view_mode': 'tree',
             'domain': domain,
             'target': 'current'