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 @@ - - - - + + + +