pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
李鹏宇
2026-04-20 15:11:20 +08:00
parent 25fcffb135
commit 3c81bfa2fb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+2 -2
View File
@@ -280,7 +280,7 @@
<field name="vacation_id" column_invisible="1"/>
<field name="employee_id" column_invisible="1"/>
<field name="workflow_record_id"
domain="[('workflow_id.name', '=', '加班'), ('create_uid.employee_id', '=', employee_id)]"/>
domain="[('workflow_id.name', 'in', ['加班', '请假']), ('create_uid.employee_id', '=', employee_id)]"/>
<field name="update_type" readonly="0"/>
<field name="update_date" readonly="0"/>
<field name="workday"/>
@@ -568,7 +568,7 @@
<field name="vacation_id" column_invisible="1"/>
<field name="employee_id" column_invisible="1"/>
<field name="workflow_record_id"
domain="[('workflow_id.name', '=', '加班'), ('create_uid.employee_id', '=', employee_id)]"/>
domain="[('workflow_id.name', '=', ['加班', '请假']), ('create_uid.employee_id', '=', employee_id)]"/>
<field name="update_type" readonly="1"/>
<field name="update_date" readonly="1"/>
<field name="workday"/>
yuthon_hr_employee/models/yuthon_medical_manage.py
+1 -1
View File
@@ -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)
yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+4 -4
View File
@@ -21,10 +21,10 @@
<field name="last_year_quota"/>
<field name="last_year_used" options='{ "fg_color": "red"}'/>
<field name="prev_last_year_remaining" options='{ "fg_color": "blue"}'/>
<field name="birthday"/>
<field name="marital_status"/>
<field name="entry_date"/>
<field name="termination_date"/>
<field name="birthday" groups="soong_workflow.group_soong_workflow_hr"/>
<field name="marital_status" groups="soong_workflow.group_soong_workflow_hr"/>
<field name="entry_date" groups="soong_workflow.group_soong_workflow_hr"/>
<field name="termination_date" groups="soong_workflow.group_soong_workflow_hr"/>
<button name="button_details" string="查看详情" type="object" class="btn btn-blue"/>
</tree>
</field>