From 643ce8a709f2ebb6964e5edbf2ce0c75044200e5 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: Mon, 19 Jan 2026 11:13:18 +0800 Subject: [PATCH 1/3] =?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 --- .../wizard/soong_workflow_record_delete_wizard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py index 581635300..4d9b8e428 100644 --- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py +++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py @@ -89,9 +89,9 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel): "state": "confirm", "active": False }) - # 确保在写入前记录仍然存在 - if target_record.exists(): - target_record.write({'active': False}) + # # # 确保在写入前记录仍然存在 + # if target_record.exists(): + # target_record.write({'is_active': False}) else: workflow_record = self.env["soong.workflow.record"].sudo().search( [("id", "=", record.id), ('reclaim_state', "=", True)], limit=1) From 88ec98eac2fd3c9b5bf38eaeff67f77c95b5f1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 19 Jan 2026 11:23:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/yuthon_business_approval_viwes.xml | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index f5980e6e2..f0151a1d1 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -27,7 +27,7 @@ invisible="urgency_level != 'urgent'"/> - + @@ -49,19 +49,24 @@ - - - - - - - + + + + + + + + - - - + + + + + + + From fe1546bc8b39fc033402f3107e86289b6d0a5694 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: Mon, 19 Jan 2026 11:34:48 +0800 Subject: [PATCH 3/3] =?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_mixin.py | 2 +- yuthon_hr_attendance/__manifest__.py | 1 - .../views/yuthon_meal_case_view.xml | 19 ------------------- .../views/yuthon_vacation_reports_views.xml | 2 +- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 yuthon_hr_attendance/views/yuthon_meal_case_view.xml diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 92cedca45..7652909da 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -894,7 +894,7 @@ class SoongWorkflowMixin(models.AbstractModel): if button.has_icon: btn_exec_action_el.set("icon", button.icon) # 接下来是隐藏的配置 - invisible = "not id or state != '{0}' ".format(str(node.node_name)) + invisible = "state != '{0}' ".format(str(node.node_name)) if button.review_type == 'user_role': # 构建角色条件 role_domain = [] diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index 926c78072..f2b41a42c 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -26,7 +26,6 @@ 'report/go_approval_templates.xml', 'views/hr_attendance_views.xml', 'views/resource_calendar_leaves_views.xml', - 'views/yuthon_meal_case_view.xml', 'views/inherit_hr_employee.xml', 'views/inherit_planning_role_views.xml', 'views/inherit_planning_slot_views.xml', diff --git a/yuthon_hr_attendance/views/yuthon_meal_case_view.xml b/yuthon_hr_attendance/views/yuthon_meal_case_view.xml deleted file mode 100644 index cc70d110f..000000000 --- a/yuthon_hr_attendance/views/yuthon_meal_case_view.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - yuthon.meal.case.tree - yuthon.meal.case - - - - - - - - - 误餐情况 - yuthon.meal.case - tree - - - diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml index 6da66cef1..b7afc8b20 100644 --- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml +++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml @@ -558,7 +558,7 @@ yuthon.vacation.reports tree [('meal_fee', '!=', 0)] - {'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_month': True} + {'search_default_group_by_vacation_month': True}