From ea1b00938628bbd1bacb36ef16850f8cb0a0a795 Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Mon, 19 Jul 2021 07:03:04 +0000
Subject: [PATCH] [IMP] crm: move 'crm_menu_views.xml' to last in manifest

Usually, the actions are defined before the menu items. So with this
commit, we load the 'crm_menu_views.xml' file at the last.

TaskID-2582208

Part-of: odoo/odoo#73530
---
 addons/crm/__manifest__.py                     |  1 -
 .../crm/report/crm_activity_report_views.xml   |  7 -------
 .../report/crm_opportunity_report_views.xml    |  8 --------
 addons/crm/views/crm_lead_views.xml            | 16 ----------------
 addons/crm/views/crm_lost_reason_views.xml     |  4 ----
 addons/crm/views/crm_menu_views.xml            | 18 +++++++++++++++++-
 addons/crm/views/crm_stage_views.xml           |  4 ----
 addons/crm/views/res_config_settings_views.xml |  4 ----
 8 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index 3cc0f711763..a864bc74c8d 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -46,7 +46,6 @@
 
         'views/calendar_views.xml',
         'views/crm_recurring_plan_views.xml',
-        'views/crm_menu_views.xml',
         'views/crm_lost_reason_views.xml',
         'views/crm_stage_views.xml',
         'views/crm_lead_views.xml',
diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index a23dfde5b15..d887f5b0b28 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -99,13 +99,6 @@
             </field>
        </record>
 
-       <menuitem
-            id="crm_activity_report_menu"
-            name="Activities"
-            parent="crm_menu_report"
-            action="crm_activity_report_action"
-            sequence="4"/>
-
         <record id="crm_activity_report_action_team" model="ir.actions.act_window">
             <field name="name">Pipeline Activities</field>
             <field name="res_model">crm.activity.report</field>
diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 128dc1c90ff..b5d76c7a878 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -127,10 +127,6 @@
             </field>
         </record>
 
-        <record id="crm_opportunity_report_menu" model="ir.ui.menu">
-            <field name="action" ref="crm.crm_opportunity_report_action"/>
-        </record>
-
         <record id="crm_opportunity_report_action_lead" model="ir.actions.act_window">
             <field name="name">Leads Analysis</field>
             <field name="res_model">crm.lead</field>
@@ -157,8 +153,4 @@
             </field>
         </record>
 
-        <record id="crm_opportunity_report_menu_lead" model="ir.ui.menu">
-            <field name="action" ref="crm.crm_opportunity_report_action_lead"/>
-        </record>
-
 </odoo>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 89a4a6b0659..ebbb498a009 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -1071,10 +1071,6 @@
             <field name="act_window_id" ref="crm_lead_all_leads"/>
         </record>
 
-        <record id="crm_menu_leads" model="ir.ui.menu">
-            <field name="action" ref="crm.crm_lead_all_leads"/>
-        </record>
-
         <!-- My Activities Menu -->
         <record id="crm_lead_action_my_activities" model="ir.actions.act_window">
             <field name="name">My Activities</field>
@@ -1247,18 +1243,6 @@
             <field name="act_window_id" ref="crm_lead_action_forecast"/>
         </record>
 
-        <record id="menu_crm_opportunities" model="ir.ui.menu">
-            <field name="action" ref="crm.action_your_pipeline"/>
-        </record>
-        <record id="crm_menu_forecast" model="ir.ui.menu">
-            <field name="action" ref="crm.action_opportunity_forecast"/>
-        </record>
-        <record id="crm_menu_root" model="ir.ui.menu">
-            <field name="action" ref="crm.action_your_pipeline"/>
-        </record>
-        <record id="crm_lead_menu_my_activities" model="ir.ui.menu">
-            <field name="action" ref="crm.crm_lead_action_my_activities"/>
-        </record>
         <!-- create a lead from 'Teams' kanban -->
         <record id="crm_lead_action_open_lead_form" model="ir.actions.act_window">
             <field name="name">New Lead</field>
diff --git a/addons/crm/views/crm_lost_reason_views.xml b/addons/crm/views/crm_lost_reason_views.xml
index 5251f1ebf88..b5a7a410074 100644
--- a/addons/crm/views/crm_lost_reason_views.xml
+++ b/addons/crm/views/crm_lost_reason_views.xml
@@ -66,8 +66,4 @@
           </p>
         </field>
     </record>
-
-    <record id="menu_crm_lost_reason" model="ir.ui.menu">
-        <field name="action" ref="crm.crm_lost_reason_action"/>
-    </record>
 </odoo>
diff --git a/addons/crm/views/crm_menu_views.xml b/addons/crm/views/crm_menu_views.xml
index 2fc5ffd38b7..5ca4e2442fa 100644
--- a/addons/crm/views/crm_menu_views.xml
+++ b/addons/crm/views/crm_menu_views.xml
@@ -23,12 +23,14 @@
         id="menu_crm_opportunities"
         name="My Pipeline"
         parent="crm_menu_sales"
+        action="crm.action_your_pipeline"
         sequence="1"/>
     <menuitem
         id="crm_lead_menu_my_activities"
         name="My Activities"
         parent="crm_menu_sales"
         groups="sales_team.group_sale_salesman"
+        action="crm.crm_lead_action_my_activities"
         sequence="2"/>
 
     <menuitem
@@ -50,6 +52,7 @@
         id="crm_menu_leads"
         name="Leads"
         parent="crm_menu_root"
+        action="crm.crm_lead_all_leads"
         groups="crm.group_use_lead"
         sequence="5"/>
 
@@ -64,29 +67,40 @@
         id="crm_menu_forecast"
         name="Forecast"
         parent="crm_menu_report"
+        action="crm.action_opportunity_forecast"
         sequence="1"/>
     <menuitem
         id="crm_opportunity_report_menu_lead"
         name="Leads"
         parent="crm_menu_report"
+        action="crm.crm_opportunity_report_action_lead"
         groups="crm.group_use_lead"
         sequence="2"/>
     <menuitem
         id="crm_opportunity_report_menu" 
         name="Pipeline"
-        parent="crm_menu_report" 
+        parent="crm_menu_report"
+        action="crm.crm_opportunity_report_action"
         sequence="3"/>
+    <menuitem
+        id="crm_activity_report_menu"
+        name="Activities"
+        parent="crm_menu_report"
+        action="crm_activity_report_action"
+        sequence="4"/>
 
     <!-- CONFIGURATION -->
     <menuitem
         id="crm_menu_config"
         name="Configuration"
         parent="crm_menu_root"
+        action="crm.action_your_pipeline"
         sequence="25" groups="sales_team.group_sale_manager"/>
     <menuitem
         id="crm_config_settings_menu"
         name="Settings"
         parent="crm_menu_config"
+        action="crm.crm_config_settings_action"
         groups="base.group_system"
         sequence="0"/>
     <menuitem
@@ -132,6 +146,7 @@
         name="Stages"
         sequence="0"
         parent="menu_crm_config_lead"
+        action="crm.crm_stage_action"
         groups="base.group_no_one"/>
     <menuitem
         id="menu_crm_lead_categ"
@@ -143,6 +158,7 @@
         id="menu_crm_lost_reason"
         name="Lost Reasons"
         parent="menu_crm_config_lead"
+        action="crm.crm_lost_reason_action"
         sequence="6"/>
 
     <menuitem
diff --git a/addons/crm/views/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml
index 4d0cade98c4..73f66907d02 100644
--- a/addons/crm/views/crm_stage_views.xml
+++ b/addons/crm/views/crm_stage_views.xml
@@ -70,8 +70,4 @@
         </field>
     </record>
 
-    <record id="menu_crm_lead_stage_act" model="ir.ui.menu">
-        <field name="action" ref="crm.crm_stage_action"/>
-    </record>
-
 </odoo>
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 8571e2ddcf0..fc3407b4006 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -179,8 +179,4 @@
         <field name="context">{'module' : 'crm', 'bin_size': False}</field>
     </record>
 
-    <record id="crm_config_settings_menu" model="ir.ui.menu">
-        <field name="action" ref="crm.crm_config_settings_action"/>
-    </record>
-
 </odoo>