From f237265d7c704712749e7ce17aa63043455e7773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Thu, 5 Mar 2026 14:59:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/models/soong_workflow_record.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index a7bc97002..6f37131cc 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/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'}) From a1273a017257f7755a665a1216e4f02029db29f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Thu, 5 Mar 2026 15:01:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index e3ae3fd36..2728328df 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/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),