diff --git a/yuthon_hr_attendance/models/overtime_carryover.py b/yuthon_hr_attendance/models/overtime_carryover.py index 159c20ce0..f3f10a045 100644 --- a/yuthon_hr_attendance/models/overtime_carryover.py +++ b/yuthon_hr_attendance/models/overtime_carryover.py @@ -18,6 +18,7 @@ class OvertimeCarryover(models.Model): carryover_type = fields.Selection([('fee', '加班费结算'), ('leave', '假单结算'), ('cancel', '销假')], string='加班补偿方式', default='leave') leave_id = fields.Many2one('hr.leave.batch', string='请假单') + date = fields.Date(compute='_compute_date') text = fields.Text(string='备注') def open_record(self): @@ -30,6 +31,12 @@ class OvertimeCarryover(models.Model): 'target': 'current', } + @api.depends('over_line_id') + def _compute_date(self): + for record in self: + if record.over_line_id: + record.date = record.over_line_id.vacation_id.vacation_date + class OvertimeCarryoverLine(models.Model): _name = 'overtime.carryover.line' diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py index bfc7826bf..1dc85fa90 100644 --- a/yuthon_hr_attendance/models/vacation_overtime_active.py +++ b/yuthon_hr_attendance/models/vacation_overtime_active.py @@ -184,7 +184,7 @@ class VacationOvertimeActive(models.Model): ('carry_forward_date', '=', self.carry_forward_date), '&', ('carryover_type', '=', 'leave'), - ('over_line_id.vacation_id.vacation_date', '>', last_day), + ('over_line_id.carry_forward_date', '>', last_day), ] view_id = self.env.ref('yuthon_hr_attendance.view_overtime_carryover_tree1').id return { diff --git a/yuthon_hr_attendance/views/overtime_carryover_views.xml b/yuthon_hr_attendance/views/overtime_carryover_views.xml index e2bf1c9ed..ab3277a5a 100644 --- a/yuthon_hr_attendance/views/overtime_carryover_views.xml +++ b/yuthon_hr_attendance/views/overtime_carryover_views.xml @@ -30,6 +30,7 @@ +