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

1

Browse Source
This commit is contained in:
李鹏宇
2025-03-28 10:22:28 +08:00
parent 44ec6abcfa
commit ed77e63e67
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee/models/yuthon_hr_employee.py
+2 -2
View File
@@ -449,10 +449,10 @@ class YuthonHrEmployee(models.Model):
else:
record.retire_years = 0
@api.depends('normal_overtime_hours', 'weekend_overtime_hours', 'holiday_overtime_hours')
@api.depends('normal_overtime_hours', 'weekend_overtime_hours')
def _compute_all_overtime_hours(self):
for record in self:
record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours + record.holiday_overtime_hours
record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours
def hr_employee_time(self):
for record in self:
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+4 -4
View File
@@ -150,9 +150,9 @@
</group>
<group name="overtime" string="加班" col="2">
<group>
<field name="normal_overtime_hours" readonly="1"/>
<field name="weekend_overtime_hours" readonly="1"/>
<field name="holiday_overtime_hours" readonly="1"/>
<field name="normal_overtime_hours" readonly="0"/>
<field name="weekend_overtime_hours" readonly="0"/>
<field name="holiday_overtime_hours" readonly="0"/>
</group>
<group>
<button name="put_overtime_return" string="详情" type="object" class="oe_highlight"/>
@@ -171,7 +171,7 @@
</group>
<group>
<field name="holiday_hours"/>
<field name="all_overtime_hours"/>
<field name="all_overtime_hours" readonly="0"/>
<field name="replacement_card_count"/>
<field name="duty_replacement_card"/>
<field name="meal_number"/>