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/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) 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} 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 @@ - - - - - - - + + + + + + + + - - - + + + + + + +