From 3f919f563ed00e5586e4ecd673a1e201201eab90 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 26 Feb 2025 10:43:45 +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 --- yuthon_hr_employee_approval/__manifest__.py | 1 - yuthon_hr_employee_approval/models/__init__.py | 3 +-- .../security/ir.model.access.csv | 2 -- yuthon_trade/__manifest__.py | 3 ++- yuthon_trade/models/__init__.py | 3 ++- .../models/yuthon_message_approval.py | 0 yuthon_trade/security/ir.model.access.csv | 2 ++ .../views/yuthon_message_approval_views.xml | 0 yuthon_trade/views/yuthon_trade_menu.xml | 10 ++++++++++ yuthon_work_brand/views/hr_menus.xml | 10 ---------- 10 files changed, 17 insertions(+), 17 deletions(-) rename {yuthon_hr_employee_approval => yuthon_trade}/models/yuthon_message_approval.py (100%) rename {yuthon_hr_employee_approval => yuthon_trade}/views/yuthon_message_approval_views.xml (100%) diff --git a/yuthon_hr_employee_approval/__manifest__.py b/yuthon_hr_employee_approval/__manifest__.py index b049a5902..fc98ef722 100644 --- a/yuthon_hr_employee_approval/__manifest__.py +++ b/yuthon_hr_employee_approval/__manifest__.py @@ -26,7 +26,6 @@ 'views/yuthon_enrollment_approval_views.xml', 'views/yuthon_retired_approval_views.xml', 'views/yuthon_account_approval_views.xml', - 'views/yuthon_message_approval_views.xml', 'views/yuthon_interview_approval_views.xml', 'views/yuthon_leaving_approval_views.xml', 'views/yuthon_prepare_approval_views.xml', diff --git a/yuthon_hr_employee_approval/models/__init__.py b/yuthon_hr_employee_approval/models/__init__.py index 142594195..05cb1dfb5 100644 --- a/yuthon_hr_employee_approval/models/__init__.py +++ b/yuthon_hr_employee_approval/models/__init__.py @@ -20,5 +20,4 @@ from . import yuthon_service_approval from . import yuthon_social_files_approval from . import yuthon_appointment_approval from . import yuthon_transfer_approval -from . import yuthon_retired_approval -from . import yuthon_message_approval \ No newline at end of file +from . import yuthon_retired_approval \ No newline at end of file diff --git a/yuthon_hr_employee_approval/security/ir.model.access.csv b/yuthon_hr_employee_approval/security/ir.model.access.csv index fa963639d..735635118 100644 --- a/yuthon_hr_employee_approval/security/ir.model.access.csv +++ b/yuthon_hr_employee_approval/security/ir.model.access.csv @@ -45,5 +45,3 @@ access_yuthon_retired_approval,yuthon_retired_approval,model_yuthon_retired_appr access_yuthon_handover_line,yuthon_handover_line,model_yuthon_handover_line,base.group_user,1,1,1,1 access_yuthon_return_line,yuthon_return_line,model_yuthon_return_line,base.group_user,1,1,1,1 access_yuthon_goods_line,yuthon_goods_line,model_yuthon_goods_line,base.group_user,1,1,1,1 -access_yuthon_message_approval,yuthon_message_approval,model_yuthon_message_approval,base.group_user,1,1,1,1 -access_yuthon_publish_type,yuthon_publish_type,model_yuthon_publish_type,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_trade/__manifest__.py b/yuthon_trade/__manifest__.py index 880d1d51b..c8e1c7658 100644 --- a/yuthon_trade/__manifest__.py +++ b/yuthon_trade/__manifest__.py @@ -19,6 +19,7 @@ 'views/yuthon_trade_premium.xml', 'views/yuthon_trade_refund.xml', 'views/yuthon_trade_reimbursed.xml', + 'views/yuthon_message_approval_views.xml', 'views/yuthon_trade_supportive.xml', 'views/yuthon_none_views.xml', 'views/yuthon_care_condolences_views.xml', @@ -27,7 +28,7 @@ 'views/yuthon_trade_menu.xml', ], 'demo': [], - 'depends': ['mail', 'documents', 'soong_workflow', 'yuthon_work_brand'], + 'depends': ['mail', 'documents', 'soong_workflow', 'yuthon_work_brand', 'hr', 'yuthon_hr_employee'], 'installable': True, 'application': True, } diff --git a/yuthon_trade/models/__init__.py b/yuthon_trade/models/__init__.py index c1f697dc3..565c3bbc3 100644 --- a/yuthon_trade/models/__init__.py +++ b/yuthon_trade/models/__init__.py @@ -12,4 +12,5 @@ from . import yuthon_trade_supportive from . import yuthon_care_condolences from . import yuthon_none from . import yuthon_work_condolences -from . import yuthon_trade_setting \ No newline at end of file +from . import yuthon_trade_setting +from . import yuthon_message_approval diff --git a/yuthon_hr_employee_approval/models/yuthon_message_approval.py b/yuthon_trade/models/yuthon_message_approval.py similarity index 100% rename from yuthon_hr_employee_approval/models/yuthon_message_approval.py rename to yuthon_trade/models/yuthon_message_approval.py diff --git a/yuthon_trade/security/ir.model.access.csv b/yuthon_trade/security/ir.model.access.csv index 7415aa40c..a15eaa5e1 100644 --- a/yuthon_trade/security/ir.model.access.csv +++ b/yuthon_trade/security/ir.model.access.csv @@ -15,5 +15,7 @@ access_yuthon_work_condolences,yuthon_work_condolences,model_yuthon_work_condole access_yuthon_care_setting,yuthon_care_setting,model_yuthon_care_setting,base.group_user,1,1,1,1 access_yuthon_work_setting,yuthon_work_setting,model_yuthon_work_setting,base.group_user,1,1,1,1 +access_yuthon_message_approval,yuthon_message_approval,model_yuthon_message_approval,base.group_user,1,1,1,1 +access_yuthon_publish_type,yuthon_publish_type,model_yuthon_publish_type,base.group_user,1,1,1,1 diff --git a/yuthon_hr_employee_approval/views/yuthon_message_approval_views.xml b/yuthon_trade/views/yuthon_message_approval_views.xml similarity index 100% rename from yuthon_hr_employee_approval/views/yuthon_message_approval_views.xml rename to yuthon_trade/views/yuthon_message_approval_views.xml diff --git a/yuthon_trade/views/yuthon_trade_menu.xml b/yuthon_trade/views/yuthon_trade_menu.xml index 5779047db..06b4d05e0 100644 --- a/yuthon_trade/views/yuthon_trade_menu.xml +++ b/yuthon_trade/views/yuthon_trade_menu.xml @@ -78,6 +78,11 @@ parent="executive_trade_process_ment" action="action_yuthon_trade_activities" sequence="13"/> + + \ No newline at end of file diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index a826b0d90..9eedb47b6 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -211,11 +211,6 @@ parent="hr_set_process_menu_root_board" action="yuthon_hr_employee_approval.view_retired_approval_action" sequence="20"/> - -