From a6ad87a4d9604af20d6f15231b03849d2ae5fefb Mon Sep 17 00:00:00 2001
From: Pratima Gupta <pgu@odoo.com>
Date: Fri, 7 Sep 2018 18:22:08 +0530
Subject: [PATCH] [IMP] crm and dependencies: improve menus, labels and filters

Specifications: improve menu organization, search filters and groupby, reorder
filters, update some field labels.

crm
===

Restructure the menus as
  * Sales
   * My Pipeline (default filter: My Opportunities)
   * My Quotations (default filter: My Quotations)
   * Team Pipelines (opens sales teams in kanban view)
   * Customers
  * Leads
   * Leads
   * Scoring Rules
   * Teams Assignation
   * Leads Assignation

sale_crm
=========

Change the parent menu for 'My Quotation' menu item as menus are changed in
sales:  crm.crm_menu_pipeline -> crm.crm_menu_sales

website_crm_partner_assign
==========================

Removed the menu and its action: crm -> Reporting -> Opp. Assignment
Change the menu sequence for crm -> Reporting -> Partnerships. Menu should
display as
  * Leads
  * Pipeline
  * Activities
  * Scoring Page views
  * Partnerships

This commit is related to task #1878516 and PR #26929 .
---
 .../crm/report/crm_activity_report_views.xml  |  2 +-
 .../report/crm_opportunity_report_views.xml   |  2 +-
 addons/crm/views/crm_lead_views.xml           | 37 +++++++++++--------
 addons/sale/views/sale_views.xml              | 20 ++++++++++
 addons/sale_crm/views/sale_order_views.xml    |  5 ++-
 addons/sales_team/views/crm_team_views.xml    |  3 +-
 .../report/crm_lead_report_view.xml           | 14 -------
 .../report/crm_partner_report_view.xml        |  2 +-
 8 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index 05bc8bc8587..073f4962e3a 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -67,7 +67,7 @@
             groups="sales_team.group_sale_manager"
             parent="crm_menu_report"
             action="crm_activity_report_action"
-            sequence="6"/>
+            sequence="3"/>
 
        <record id="crm_activity_report_action_team" model="ir.actions.act_window">
            <field name="name">Activities Analysis</field>
diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 3169cf64bf4..07329f850bb 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -126,7 +126,7 @@ mainly used by the sales manager in order to do the periodic review with the
 teams of the sales pipeline.</field>
         </record>
         <menuitem id="crm_opportunity_report_menu" name="Pipeline"
-            parent="crm_menu_report" action="crm_opportunity_report_action" sequence="5"/>
+            parent="crm_menu_report" action="crm_opportunity_report_action" sequence="2"/>
 
         <record id="crm_opportunity_report_action_graph" model="ir.actions.act_window">
             <field name="name">Pipeline Analysis</field>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 2a84417765a..5813b5a7378 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -830,21 +830,28 @@ for rec in records:
             Menu Actions
         -->
         <menuitem
-            id="crm_menu_pipeline"
-            name="Pipeline"
+            id="crm_menu_sales"
+            name="Sales"
             parent="crm_menu_root"
             sequence="1"/>
 
-        <menuitem id="res_partner_menu_crm"
-            parent="crm_menu_root"
-            action="base.action_partner_form"
-            sequence="2"/>
-
-        <menuitem id="sales_team_menu_report_crm"
-            name="Sales Teams"
-            parent="crm_menu_pipeline"
+        <menuitem id="sales_team_menu_team_pipeline"
+            name="Team Pipelines"
+            parent="crm_menu_sales"
             action="sales_team.crm_team_salesteams_act"
-            sequence="10"/>
+            sequence="4"/>
+
+        <menuitem id="res_partner_menu_customer"
+            name="Customers"
+            parent="crm_menu_sales"
+            action="base.action_partner_form"
+            sequence="5"/>
+
+        <menuitem id="crm_menu_leads"
+            name="Leads"
+            parent="crm_menu_root"
+            groups="crm.group_use_lead"
+            sequence="5"/>
 
         <!-- Lead Menu -->
         <record model="ir.actions.act_window" id="crm_lead_all_leads">
@@ -899,7 +906,7 @@ for rec in records:
         <menuitem
             id="menu_crm_leads"
             name="Leads"
-            parent="crm_menu_pipeline"
+            parent="crm_menu_leads"
             sequence="1"
             action="crm_lead_all_leads"
             groups="crm.group_use_lead"/>
@@ -1025,9 +1032,9 @@ for rec in records:
         <menuitem
             id="menu_crm_opportunities"
             action="action_your_pipeline"
-            name="Pipeline"
-            parent="crm_menu_pipeline"
-            sequence="5"/>
+            name="My Pipeline"
+            parent="crm_menu_sales"
+            sequence="1"/>
 
         <menuitem
             id="crm.crm_menu_root"
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index fe8d16adc11..84dc483ffb6 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -640,6 +640,24 @@
             </field>
         </record>
 
+        <record id="sale_order_quotation_view_search_inherit" model="ir.ui.view">
+            <field name="name">sale.order.quotation.search.view.inherit</field>
+            <field name="model">sale.order</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='my_sale_orders_filter']" position="replace">
+                    <separator/>
+                    <filter string="My Quotations" name="my_quotation" domain="[('state','=','draft'), ('user_id','=',uid)]"/>
+                    <separator/>
+                    <filter string="Quotations" name="draft" domain="[('state','=','draft')]"/>
+                    <filter string="Sales Orders" name="sales" domain="[('state','in',('sale','done'))]"/>
+                    <separator/>
+                    <filter string="Order Date" name="filter_order_date" date="date_order"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="sale_order_view_search_inherit_sale" model="ir.ui.view">
             <field name="name">sale.order.search.inherit.sale</field>
             <field name="model">sale.order</field>
@@ -787,6 +805,7 @@
             <field name="view_id" ref="view_quotation_tree_with_onboarding"/>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph</field>
             <field name="search_view_id" ref="sale_order_view_search_inherit_quotation"/>
+            <field name="context">{'search_default_my_quotation': 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new quotation, the first step of a new sale!
@@ -801,6 +820,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="search_view_id" ref="sale_order_view_search_inherit_quotation"/>
+            <field name="context">{'search_default_my_quotation': 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new quotation, the first step of a new sale!
diff --git a/addons/sale_crm/views/sale_order_views.xml b/addons/sale_crm/views/sale_order_views.xml
index 571614e1cae..f971913417e 100644
--- a/addons/sale_crm/views/sale_order_views.xml
+++ b/addons/sale_crm/views/sale_order_views.xml
@@ -47,8 +47,9 @@
     <!-- This menu is display in CRM app when sale is installed-->
     <menuitem
         id="sale_order_menu_quotations_crm"
+        name="My Quotations"
         action="sale.action_quotations"
-        parent="crm.crm_menu_pipeline"
-        sequence="10"/>
+        parent="crm.crm_menu_sales"
+        sequence="2"/>
 
 </odoo>
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index c273d88fdad..fda24026c40 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -22,11 +22,12 @@
 
         <!-- Case Teams Action -->
         <record id="crm_team_salesteams_act" model="ir.actions.act_window">
-            <field name="name">Sales Dashboard</field>
+            <field name="name">Team Pipelines</field>
             <field name="res_model">crm.team</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,form</field>
             <field name="context">{'search_default_my_favorites': 1}</field>
+            <field name="domain">[('use_opportunities', '=', True)]</field>
             <field name="view_id" ref="crm_team_salesteams_search"/>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
diff --git a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
index 116bda5d38b..409b3291223 100644
--- a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
@@ -58,18 +58,4 @@
             </field>
         </record>
 
-       <!-- Leads by user and Team Action -->
-
-       <record id="action_report_crm_opportunity_assign" model="ir.actions.act_window">
-            <field name="name">Opp. Assignment Analysis</field>
-            <field name="res_model">crm.lead.report.assign</field>
-            <field name="view_type">form</field>
-            <field name="context">{'default_type': 'opportunity', 'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="view_mode">graph,pivot</field>
-            <field name="domain">[('type', '=', 'opportunity')]</field>
-        </record>
-
-       <menuitem id="menu_report_crm_opportunities_assign_tree"
-           parent="crm.crm_menu_report" name="Opp. Assignment" action="action_report_crm_opportunity_assign" sequence="3"/>
-
 </odoo>
diff --git a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
index eb5a8c47297..c77f80e798c 100644
--- a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
@@ -51,6 +51,6 @@
         </record>
 
        <menuitem name="Partnerships" id="menu_report_crm_partner_assign_tree"
-           parent="crm.crm_menu_report" action="action_report_crm_partner_assign" sequence="4"/>
+           parent="crm.crm_menu_report" action="action_report_crm_partner_assign" sequence="5"/>
 
 </odoo>