From 1ac1e7b2a8a278e2f08bac2daf334eb882c15055 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Wed, 20 Nov 2024 18:14:49 +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_lessee_service/__manifest__.py         |  5 +-
 yuthon_lessee_service/views/all_menu.xml      | 54 +++++++++++++++++
 yuthon_property_approval/__manifest__.py      |  2 +-
 .../views/property_menu_all.xml               | 58 -------------------
 4 files changed, 58 insertions(+), 61 deletions(-)
 create mode 100644 yuthon_lessee_service/views/all_menu.xml

diff --git a/yuthon_lessee_service/__manifest__.py b/yuthon_lessee_service/__manifest__.py
index 486d12b45..d396aac6c 100644
--- a/yuthon_lessee_service/__manifest__.py
+++ b/yuthon_lessee_service/__manifest__.py
@@ -10,10 +10,11 @@
         'data/lessee_service_code.xml',
         'security/ir.model.access.csv',
         'views/yuthon_lessee_notice.xml',
-        'views/property_report_repair.xml'
+        'views/property_report_repair.xml',
+        'views/all_menu.xml'
     ],
     'demo': [],
-    'depends': ['hr','mail', 'base', 'survey', 'soong_workflow', 'yuthon_wechat', 'documents'],
+    'depends': ['hr','mail', 'base', 'survey', 'soong_workflow', 'yuthon_wechat', 'documents','yuthon_property_approval'],
     'installable': True,
     'application': True,
 }
diff --git a/yuthon_lessee_service/views/all_menu.xml b/yuthon_lessee_service/views/all_menu.xml
new file mode 100644
index 000000000..a7336100d
--- /dev/null
+++ b/yuthon_lessee_service/views/all_menu.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <!--调查-->
+    <record id="survey.menu_surveys" model="ir.ui.menu">
+        <field name="active">False</field>
+    </record>
+    <menuitem id="yuthon_lessee_service_notice"
+              parent="yuthon_property.yuthon_customer_service_menu"
+              name="通知公告"
+              action="yuthon_lessee_service.yuthon_lessee_notice_action"
+              sequence="1"/>
+    <menuitem id="yuthon_lessee_document_investigation"
+              parent="yuthon_property.yuthon_customer_service_menu"
+              name="资料调查"
+              sequence="3"/>
+    <menuitem id="yuthon_lessee_service_investigation"
+              parent="yuthon_lessee_document_investigation"
+              name="调查"
+              action="survey.action_survey_form"
+              sequence="1"/>
+    <menuitem id="yuthon_lessee_service_participate"
+              parent="yuthon_lessee_document_investigation"
+              name="参与"
+              action="survey.action_survey_user_input"
+              sequence="3"/>
+    <menuitem id="yuthon_lessee_question_answers"
+              parent="yuthon_lessee_document_investigation"
+              name="问题与答案"
+              sequence="5"/>
+    <menuitem id="yuthon_lessee_question"
+              parent="yuthon_lessee_question_answers"
+              name="问题"
+              action="survey.action_survey_question_form"
+              sequence="1"/>
+    <menuitem id="yuthon_lessee_suggest"
+              parent="yuthon_lessee_question_answers"
+              name="建议值"
+              action="survey.survey_question_answer_action"
+              sequence="3"/>
+    <menuitem id="yuthon_lessee_service_answer"
+              parent="yuthon_lessee_question_answers"
+              name="详细解答"
+              action="survey.survey_user_input_line_action"
+              sequence="5"/>
+    <menuitem id="yuthon_lessee_service_process"
+              parent="yuthon_property.yuthon_customer_service_menu"
+              name="流程"
+              sequence="99"/>
+    <menuitem id="property_report_repair_menu"
+              parent="yuthon_lessee_service_process"
+              name="报事报修审批"
+              action="yuthon_lessee_service.property_report_repair_action"
+              sequence="1"/>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py
index 51d796be5..6c698dc19 100644
--- a/yuthon_property_approval/__manifest__.py
+++ b/yuthon_property_approval/__manifest__.py
@@ -53,7 +53,7 @@
         'views/property_menu_all.xml',
     ],
     'demo': [],
-    'depends': ['mail', 'soong_workflow','documents', 'yuthon_property', 'yuthon_lessee_service', 'survey'],
+    'depends': ['mail', 'soong_workflow','documents', 'yuthon_property','hr'],
     'installable': True,
     'application': True,
 }
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index b3d1d7874..0313313d8 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!--调查-->
-    <record id="survey.menu_surveys" model="ir.ui.menu">
-        <field name="active">False</field>
-    </record>
     <menuitem
             id="property_approval_menu"
             parent="yuthon_property.resource_management_menu"
@@ -99,12 +95,6 @@
             name="更名申请表"
             action="property_renamed_action"
             sequence="42"/>
-    <!--    <menuitem-->
-    <!--        id="property_contract_changes_menu"-->
-    <!--        parent="yuthon_property.property_approval_menu"-->
-    <!--        name="租聘合同变更审批"-->
-    <!--        action="action_property_contract_changes"-->
-    <!--        sequence="43"/>-->
     <menuitem
             id="property_construction_work_menu"
             parent="yuthon_property.property_approval_menu"
@@ -246,52 +236,4 @@
               name="违约金比例调整"
               parent="yuthon_property_process"
               action="property_penalty_proportion_action"/>
-    <!-- 客户服务 -->
-    <menuitem id="yuthon_lessee_service_notice"
-              parent="yuthon_property.yuthon_customer_service_menu"
-              name="通知公告"
-              action="yuthon_lessee_service.yuthon_lessee_notice_action"
-              sequence="1"/>
-    <menuitem id="yuthon_lessee_document_investigation"
-              parent="yuthon_property.yuthon_customer_service_menu"
-              name="资料调查"
-              sequence="3"/>
-    <menuitem id="yuthon_lessee_service_investigation"
-              parent="yuthon_lessee_document_investigation"
-              name="调查"
-              action="survey.action_survey_form"
-              sequence="1"/>
-    <menuitem id="yuthon_lessee_service_participate"
-              parent="yuthon_lessee_document_investigation"
-              name="参与"
-              action="survey.action_survey_user_input"
-              sequence="3"/>
-    <menuitem id="yuthon_lessee_question_answers"
-              parent="yuthon_lessee_document_investigation"
-              name="问题与答案"
-              sequence="5"/>
-    <menuitem id="yuthon_lessee_question"
-              parent="yuthon_lessee_question_answers"
-              name="问题"
-              action="survey.action_survey_question_form"
-              sequence="1"/>
-    <menuitem id="yuthon_lessee_suggest"
-              parent="yuthon_lessee_question_answers"
-              name="建议值"
-              action="survey.survey_question_answer_action"
-              sequence="3"/>
-    <menuitem id="yuthon_lessee_service_answer"
-              parent="yuthon_lessee_question_answers"
-              name="详细解答"
-              action="survey.survey_user_input_line_action"
-              sequence="5"/>
-    <menuitem id="yuthon_lessee_service_process"
-              parent="yuthon_property.yuthon_customer_service_menu"
-              name="流程"
-              sequence="99"/>
-    <menuitem id="property_report_repair_menu"
-              parent="yuthon_lessee_service_process"
-              name="报事报修审批"
-              action="yuthon_lessee_service.property_report_repair_action"
-              sequence="1"/>
 </odoo>
\ No newline at end of file