From 46ffa0a9f014a3b407213778f98667298619e26d 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, 23 Apr 2026 19:51:50 +0800 Subject: [PATCH] =?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/wizard/soong_workflow_comment_wizard.py | 2 +- yuthon_hr_employee/models/yuthon_hr_employee.py | 2 +- yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 7ada98a92..f86b5fca0 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -219,7 +219,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): if not record_id or not record_id.workflow_id: continue - # 排除规则:存在 node_btn_name == '1' 直接放行不限制 + # 排除规则:存在流程退回 直接放行不限制 has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1') if has_exclude_log: continue diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index af39090d4..eec20a72e 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -26,7 +26,7 @@ class YuthonHrEmployee(models.Model): 对原模型数据的隐藏,字段的开发和添加 """ _inherit = "hr.employee" - _order = 'user_number asc' + _order = 'number asc' # name = fields.CharWithPinyin(default_export_compatible=True) user_role_ids_changed = fields.Boolean(string="xxx") # bug diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index c7a92cd7c..928360b4e 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -589,7 +589,7 @@ hr.employee.member hr.employee - +