diff --git a/yuthon_hr_attendance/models/overtime_carryover.py b/yuthon_hr_attendance/models/overtime_carryover.py index 697b054b1..4beb9cebd 100644 --- a/yuthon_hr_attendance/models/overtime_carryover.py +++ b/yuthon_hr_attendance/models/overtime_carryover.py @@ -7,6 +7,8 @@ class OvertimeCarryover(models.Model): _name = 'overtime.carryover' _description = '加班结转明细' + + over_line_id = fields.Many2one('vacation.over.line', string='加班记录(结转)') over_line_id1 = fields.Many2one('vacation.over.line', string='加班记录(销假)') carry_forward_date = fields.Date(string="结转日期") diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py index 0fc73ad6e..ff4e7284d 100644 --- a/yuthon_hr_attendance/models/vacation_overtime_active.py +++ b/yuthon_hr_attendance/models/vacation_overtime_active.py @@ -165,13 +165,15 @@ class VacationOvertimeActive(models.Model): def open_record(self): self.ensure_one() domain = [ - ('employee_id', '=', self.employee_id.id), - ('carry_forward_date', '=', self.carry_forward_date) + ('over_line_id.vacation_id.employee_id', '=', self.employee_id.id), + ('carryover_type', '=', 'fee'), + ('carry_forward_date', '=', self.carry_forward_date), + ('is_void', '=', False) ] return { 'name': f'加班明细', 'type': 'ir.actions.act_window', - 'res_model': 'overtime.active.line', + 'res_model': 'overtime.carryover', 'view_mode': 'tree', 'domain': domain, 'target': 'current'