From 3c81bfa2fb61c3fe64be7bd48a578e10a5218f92 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: Mon, 20 Apr 2026 15:11:20 +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
---
.../views/yuthon_vacation_reports_views.xml | 4 ++--
yuthon_hr_employee/models/yuthon_medical_manage.py | 2 +-
yuthon_hr_employee/views/yuthon_medical_manage_views.xml | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index a682a4c8f..2103f5cf3 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -280,7 +280,7 @@
+ domain="[('workflow_id.name', 'in', ['加班', '请假']), ('create_uid.employee_id', '=', employee_id)]"/>
@@ -568,7 +568,7 @@
+ domain="[('workflow_id.name', '=', ['加班', '请假']), ('create_uid.employee_id', '=', employee_id)]"/>
diff --git a/yuthon_hr_employee/models/yuthon_medical_manage.py b/yuthon_hr_employee/models/yuthon_medical_manage.py
index 845acfd50..acba44060 100644
--- a/yuthon_hr_employee/models/yuthon_medical_manage.py
+++ b/yuthon_hr_employee/models/yuthon_medical_manage.py
@@ -103,7 +103,7 @@ class YuthonMedicalManage(models.Model):
if employee.user_sex == 'girl':
if employee.marital == 'single':
final_quota += rule.allowance_unmarried_women
- elif employee.marital == 'married':
+ elif employee.marital in ['married', 'divorced']:
final_quota += rule.allowance_married_women
entry_date = fields.Date.from_string(employee.entry_date)
diff --git a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
index 863dbb799..0d34db914 100644
--- a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+++ b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
@@ -21,10 +21,10 @@
-
-
-
-
+
+
+
+