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

!4339 !4338 添加功能

Browse Source 
Merge pull request !4339 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-06 02:05:24 +00:00
committed by Gitee
parent b5d4b14e8a b27c009140
commit bc12bdca54
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+6 -10
View File
@@ -22,8 +22,8 @@ class YuthonVacationReports(models.Model):
other_fee_ids = fields.One2many('vacation.other.line', 'vacation_id', string='其他明细')
vacation_date = fields.Date(string='日期', default=lambda self: fields.Date.today())
leave = fields.Char(string='年假', compute='_compute_leave', store=True, digits=(16, 3))
working_overtime = fields.Char(string='加班时', compute='_compute_working_overtime', store=True, digits=(16, 3))
leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 3))
working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', store=True, digits=(16, 3))
meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True)
medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True)
compensatory_leave = fields.Integer(string="调休")
@@ -216,8 +216,7 @@ class YuthonVacationReports(models.Model):
leave_hours += line_value
elif line.update_type == 'reduce':
leave_hours -= line_value
leave_days = leave_hours / 8
record.leave = f"{leave_days:.3f}"
record.leave = leave_hours / 8
overtime_hours = 0.0
for line in record.overtime_ids:
@@ -227,8 +226,7 @@ class YuthonVacationReports(models.Model):
overtime_hours += line_total
elif line.update_type == 'reduce':
overtime_hours -= line_total
overtime_days = overtime_hours / 8
record.working_overtime = f"{overtime_days:.3f}"
record.working_overtime = overtime_hours / 8
def vacation_delete(self):
vacation_ids = self.env["yuthon.vacation.reports"].browse(
@@ -267,8 +265,7 @@ class YuthonVacationReports(models.Model):
elif line.update_type == 'reduce':
leave_hours -= line_value
leave_days = leave_hours / 8
record.leave = f"{leave_days:.2f}"
record.leave = leave_hours / 8
@api.depends(
'overtime_ids.workday',
@@ -287,8 +284,7 @@ class YuthonVacationReports(models.Model):
overtime_hours += line_total
elif line.update_type == 'reduce':
overtime_hours -= line_total
overtime_days = overtime_hours / 8
record.working_overtime = f"{overtime_days:.2f}"
record.working_overtime = overtime_hours / 8
@api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type', 'meal_fee_ids.is_void')
def _compute_meal_fee(self):