diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index f5215e3f9..793fc188b 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -719,6 +719,8 @@ 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 # 累计请假天数
is_retired = rec.employee_id.user_state in ('leave', 'withdraw')
@@ -1343,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)
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 @@
+ domain="[('end_comparison', 'in', ['red', 'yellow', 'blue'])]" shownumber="1"/>