From 741d6ba46d71ceceeaf1af390ca4fcf84c28cc58 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, 25 Feb 2026 02:15:48 +0800
Subject: [PATCH 1/2] =?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/yuthon_vacation_reports.py | 1 +
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index f5215e3f9..c8d2b5509 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -721,6 +721,7 @@ class YuthonVacationReports(models.Model):
             regular_days = 0  # 转正天数
             actual_attendance = 0  # 实到天数 = 应到天数 - 请假总天数 - 异常天数
             leave_total_days = 0  # 累计请假天数
+            test_days = 0
             is_retired = rec.employee_id.user_state in ('leave', 'withdraw')
             if rec.employee_id and rec.vacation_date and not is_retired:
                 year = rec.vacation_date.year
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 4f4a1d5b0..f01539413 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -629,7 +629,7 @@
                         <filter string="离职" name="to_do" domain="[('user_state', '=', 'leave')]"/>
                         <filter string="退休" name="done" domain="[('user_state', '=', 'withdraw')]"/>
                         <filter string="即将到期" name="end"
-                                domain="[('end_comparison', 'in', ['red', 'yellow', 'blue'])]"/>
+                                domain="[('end_comparison', 'in', ['red', 'yellow', 'blue'])]" shownumber="1"/>
                     </quick_filter>
                 </header_search>
             </xpath>

From b79da477bd168675796c3a24de5098565e639e77 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, 25 Feb 2026 02:23:55 +0800
Subject: [PATCH 2/2] =?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/yuthon_vacation_reports.py               | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index c8d2b5509..793fc188b 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -719,9 +719,10 @@ class YuthonVacationReports(models.Model):
             is_abnormal = 0
             probation_days = 0  # 试用期天数
             regular_days = 0  # 转正天数
+            rec.test_days = 0
+            rec.right_days = 0
             actual_attendance = 0  # 实到天数 = 应到天数 - 请假总天数 - 异常天数
             leave_total_days = 0  # 累计请假天数
-            test_days = 0
             is_retired = rec.employee_id.user_state in ('leave', 'withdraw')
             if rec.employee_id and rec.vacation_date and not is_retired:
                 year = rec.vacation_date.year
@@ -1344,13 +1345,13 @@ class YuthonVacationReports(models.Model):
     def monthly_report(self):
         fixed_date = date(2026, 2, 1)
         current_month_first = fixed_date
-        employees = self.env['hr.employee'].search([('user_state', '=', 'in'), ('name', '=', '黄一辉')])
+        employees = self.env['hr.employee'].search([
+            ('user_state', '=', 'in')
+        ])
         # today = fields.Date.today()
-        # employees = self.env['hr.employee'].search([('contract_id.state', '=', 'open'), ('name', '=', '和博延')])
-        # current_month_first = today.replace(day=1)
         for employee in employees:
-            # resource_user_ids = employee.resource_calendar_id.resource_user_ids.ids
-            # is_resource_user = employee.id in resource_user_ids
+            resource_user_ids = employee.resource_calendar_id.resource_user_ids.ids
+            is_resource_user = employee.id in resource_user_ids
             existing_record = self.search([
                 ('employee_id', '=', employee.id),
                 ('vacation_date', '=', current_month_first)