!12366 !12365 添加功能

Merge pull request !12366 from 李鹏宇/dev

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -3341,10 +3341,15 @@ class VacationMealLine(models.Model):
     def confirm(self):
         valid_leaves = self.env['vacation.meal.line'].browse(
             self._context.get('active_ids', self._context.get('active_id')))
+        # 检查确认日期，没有则提示未确认
+        for rec in valid_leaves:
+            if not rec.confirm_date:
+                raise UserError("未确认，请勿归档")
+
         emp_month_summary = {}
         for rec in valid_leaves:
-            rec_year = rec.start_time.year
-            rec_month = rec.start_time.month
+            rec_year = rec.confirm_date.year
+            rec_month = rec.confirm_date.month
             rec.write({'is_filing': True})
             emp_id = rec.employee_id.id
             active_exists = self.env['vacation.meal.active'].search([
@@ -3375,7 +3380,6 @@ class VacationMealLine(models.Model):
                 emp_month_summary[summary_key] = 0.0
             emp_month_summary[summary_key] += rec.update_lines or 0.0
 
-        # 4. 第二步：遍历汇总结果，为每个【员工+年月】创建一条vacation.over.line
         for (emp_id, rec_year, rec_month), total_amount in emp_month_summary.items():
             if total_amount <= 1e-6:
                 continue