!1586 添加功能

Merge pull request !1586 from 李鹏宇/dev_zhou

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',

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
+from . import yuthon_retired_approval

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

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,
 }

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
+from . import yuthon_trade_setting
+from . import yuthon_message_approval

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
 
 

yuthon_trade/views/yuthon_trade_menu.xml

@@ -78,6 +78,11 @@
               parent="executive_trade_process_ment"
               action="action_yuthon_trade_activities"
               sequence="13"/>
+    <menuitem id="hr_menu_message_approval"
+              name="信息发布申请表"
+              parent="executive_trade_process_ment"
+              action="view_yuthon_message_approval_action"
+              sequence="20"/>
 
     <menuitem id="executive_trade_setting"
               name="配置"
@@ -93,4 +98,9 @@
               parent="executive_trade_setting"
               action="view_yuthon_work_setting_action"
               sequence="10"/>
+     <menuitem id="hr_publish_setting_board"
+              name="目标平台配置"
+              parent="executive_trade_setting"
+              action="view_yuthon_publish_type_action"
+              sequence="20"/>
 </odoo>

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"/>
-    <menuitem id="hr_menu_message_approval"
-              name="信息发布申请表"
-              parent="hr_set_process_menu_root_board"
-              action="yuthon_hr_employee_approval.view_yuthon_message_approval_action"
-              sequence="29"/>
 
     <menuitem id="hr_setting_menu_root_board"
               name="配置"
@@ -267,11 +262,6 @@
               parent="hr_setting_menu_root_board"
               action="yuthon_hr_employee.action_yuthon_party_setting"
               sequence="20"/>
-    <menuitem id="hr_publish_setting_board"
-              name="目标平台配置"
-              parent="hr_setting_menu_root_board"
-              action="yuthon_hr_employee_approval.view_yuthon_publish_type_action"
-              sequence="25"/>
 
     <!--假期管理-->
     <menuitem id="holiday_manage_menu_root_board"