diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 0a3ae32cc..d0c39adbb 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -682,7 +682,7 @@ class HolidaysRequestBatch(models.Model): over_line=carry_line, over_line1=over_line1, deduct_amount=deduct_amount, - carry_date=period_start, + carry_date=actual_vacation_report.vacation_date, ) remaining_deduct -= deduct_amount carry_line._compute_carry_forward_info() @@ -867,12 +867,11 @@ class HolidaysRequestBatch(models.Model): """ 封装创建加班结转明细的逻辑 """ - carry_forward_date = (self.log_ids[-1].lase_click_date).date() self.env['overtime.carryover'].create({ 'leave_id': self.id, 'over_line_id': over_line.id, 'over_line_id1': over_line1.id, - 'carry_forward_date': carry_forward_date, + 'carry_forward_date': carry_date, 'carry_forward_quantity': deduct_amount, 'carryover_type': 'leave', 'text': '',