!9287 !9286 添加功能

Merge pull request !9287 from 李鹏宇/dev

soong_workflow/models/soong_workflow_record.py

@@ -498,7 +498,8 @@ class SoongWorkflowRecord(models.Model):
             if record_id:
                 if not hasattr(record_id, 'log_ids'):
                     continue
-                for log in record_id.log_ids:
+                valid_logs = record_id.log_ids.filtered(lambda l: l.node_btn_name != '1')
+                for log in valid_logs:
                     if log.done_by.name == self.env.user.name:
                         if log.name == '归档' and (log.approval_state == '0' or log.approval_state == '1'):
                             record.write({'soong_state': 'to_active'})

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -200,6 +200,7 @@ class YuthonVacationReports(models.Model):
             "views": [(False, "tree")],
             'res_model': 'vacation.meal.line',
             'domain': [
+                ('start_time', '>=', datetime(2026, 12, 1)),
                 ('meal', '=', 'yes'),
                 ('vacation_id', '!=', False),
                 ('workflow_id', '!=', False),