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

!5064 !5063 添加功能

Browse Source 
Merge pull request !5064 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-09-10 11:18:07 +00:00
committed by Gitee
parent f513c6a46d fec5d4798a
commit 7e0ce377e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+3 -3
View File
@@ -28,7 +28,7 @@ class YuthonVacationReports(models.Model):
done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 3),
store=True, group_operator=None)
leave = fields.Float(string='剩余年假', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None)
working_overtime = fields.Float(string='剩余加班时', compute='_compute_working_overtime', store=True,
working_overtime = fields.Float(string='剩余补休', compute='_compute_working_overtime', store=True,
digits=(16, 3), group_operator=None)
meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True, group_operator=None)
medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True, group_operator=None)
@@ -36,7 +36,7 @@ class YuthonVacationReports(models.Model):
leave_of_absence = fields.Float(string="事假", digits=(16, 3), compute='_compute_other_leave', store=True,
group_operator=None)
statutory_leave = fields.Integer(string="加班时(法定)", compute='_compute_other_leave', store=True, group_operator=None)
cop_leave = fields.Float(string='补休', digits=(16, 3), compute='_compute_other_leave', store=True,
cop_leave = fields.Float(string='补休', digits=(16, 3), store=True, compute='_compute_working_overtime',
group_operator=None)
duty_off_leave = fields.Integer(string='值班调休', compute='_compute_other_leave', store=True, group_operator=None)
marriage_leave = fields.Integer(string='婚假', compute='_compute_other_leave', store=True, group_operator=None)
@@ -514,8 +514,8 @@ class YuthonVacationReports(models.Model):
line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
if line.update_type == 'add':
total_add += line_total
elif line.update_type == 'reduce':
total_reduce += line_total
elif line.update_type == 'reduce':
total_add -= line_total
done_working_overtime += line_total
record.working_overtime = max(total_add / 8, 0)