diff --git a/yuthon_holiday/models/yuthon_vacation_reports.py b/yuthon_holiday/models/yuthon_vacation_reports.py index 81c5fd0ea..448780df2 100644 --- a/yuthon_holiday/models/yuthon_vacation_reports.py +++ b/yuthon_holiday/models/yuthon_vacation_reports.py @@ -19,11 +19,11 @@ class YuthonVacationReports(models.Model): working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', store=True) meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True) - @api.depends('vacation_leave_line_ids.update_lines', 'vacation_leave_line_ids.update_type') + @api.depends('leave_ids.update_lines', 'leave_ids.update_type') def _compute_leave(self): for record in self: leave_total = 0.0 - for line in record.vacation_leave_line_ids: + for line in record.leave_ids: if line.update_type == 'add': leave_total += line.update_lines or 0 elif line.update_type == 'reduce': @@ -31,15 +31,15 @@ class YuthonVacationReports(models.Model): record.leave = leave_total @api.depends( - 'vacation_over_line_ids.workday', - 'vacation_over_line_ids.legal_day', - 'vacation_over_line_ids.public_holidays', - 'vacation_over_line_ids.update_type' + 'overtime_ids.workday', + 'overtime_ids.legal_day', + 'overtime_ids.public_holidays', + 'overtime_ids.update_type' ) def _compute_working_overtime(self): for record in self: overtime_total = 0.0 - for line in record.vacation_over_line_ids: + for line in record.overtime_ids: line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0) if line.update_type == 'add': overtime_total += line_total @@ -47,11 +47,11 @@ class YuthonVacationReports(models.Model): overtime_total -= line_total record.working_overtime = overtime_total - @api.depends('vacation_meal_line_ids.update_lines', 'vacation_meal_line_ids.update_type') + @api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type') def _compute_meal_fee(self): for record in self: meal_total = 0 - for line in record.vacation_meal_line_ids: + for line in record.meal_fee_ids: if line.update_type == 'add': meal_total += int(line.update_lines or 0) elif line.update_type == 'reduce':