From e3f13e08e3c01b6bdd5b89560906fa5bcb525376 Mon Sep 17 00:00:00 2001
From: Mitul Shah <mish@odoo.com>
Date: Tue, 26 Oct 2021 08:39:37 +0000
Subject: [PATCH] [IMP] crm,website_crm_{iap_reveal, partner_assign}: organize
 reporting measures

This commit removes the unnecessary measures(like partner latitude/longitude)
from the lead related graph views. Also, we try to order the measures and keep
time related measures(Days to Assign, Days to Close, Exceeded Closing Days, etc)
first and revenue related measures(Expected Revenues, Prorated Revenues, etc)
last.

Note that with this commit, recurring revenue related measures will be displayed
only when the feature is activated.

ent PR: https://github.com/odoo/enterprise/pull/21981

Task-2674367

closes odoo/odoo#79167

Related: odoo/enterprise#21981
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../report/crm_opportunity_report_views.xml   | 13 +++++++
 addons/crm/views/crm_lead_views.xml           | 13 ++++++-
 .../views/crm_lead_views.xml                  | 34 ++++++++++++++++++
 .../views/crm_lead_views.xml                  | 36 +++++++++++++++++++
 4 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 8d0881921ea..e13f22cf09d 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -23,6 +23,13 @@
                 <pivot string="Leads Analysis" sample="1">
                     <field name="create_date" interval="month" type="row"/>
                     <field name="team_id" type="col"/>
+                    <field name="color" invisible="1"/>
+                    <field name="message_bounce" invisible="1"/>
+                    <field name="probability" invisible="1"/>
+                    <field name="automated_probability" invisible="1"/>
+                    <field name="recurring_revenue_monthly" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue_monthly_prorated" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue" groups="crm.group_use_recurring_revenues"/>
                 </pivot>
             </field>
         </record>
@@ -50,6 +57,12 @@
                     <field name="create_date" interval="month"/>
                     <field name="team_id"/>
                     <field name="color" invisible="1"/>
+                    <field name="automated_probability" invisible="1"/>
+                    <field name="message_bounce" invisible="1"/>
+                    <field name="probability" invisible="1"/>
+                    <field name="recurring_revenue_monthly" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue_monthly_prorated" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue" groups="crm.group_use_recurring_revenues"/>
                 </graph>
             </field>
         </record>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 43f1435abb6..2c1e97137b6 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -900,6 +900,9 @@
                     <field name="day_close" invisible="1"/>
                     <field name="message_bounce" invisible="1"/>
                     <field name="probability" invisible="1"/>
+                    <field name="recurring_revenue_monthly" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue_monthly_prorated" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue" groups="crm.group_use_recurring_revenues"/>
                 </graph>
             </field>
         </record>
@@ -912,8 +915,13 @@
                     <field name="create_date" interval="month" type="row"/>
                     <field name="stage_id" type="col"/>
                     <field name="expected_revenue" type="measure"/>
-                    <field name="recurring_revenue_monthly" type="measure" groups="crm.group_use_recurring_revenues"/>
                     <field name="color" invisible="1"/>
+                    <field name="automated_probability" invisible="1"/>
+                    <field name="message_bounce" invisible="1"/>
+                    <field name="probability" invisible="1"/>
+                    <field name="recurring_revenue_monthly" type="measure" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue_monthly_prorated" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue" groups="crm.group_use_recurring_revenues"/>
                 </pivot>
             </field>
         </record>
@@ -933,6 +941,9 @@
                     <field name="day_close" invisible="1"/>
                     <field name="message_bounce" invisible="1"/>
                     <field name="probability" invisible="1"/>
+                    <field name="recurring_revenue_monthly" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue_monthly_prorated" groups="crm.group_use_recurring_revenues"/>
+                    <field name="recurring_revenue" groups="crm.group_use_recurring_revenues"/>
                 </pivot>
             </field>
         </record>
diff --git a/addons/website_crm_iap_reveal/views/crm_lead_views.xml b/addons/website_crm_iap_reveal/views/crm_lead_views.xml
index 5bb287a5163..d00ef1eaa67 100644
--- a/addons/website_crm_iap_reveal/views/crm_lead_views.xml
+++ b/addons/website_crm_iap_reveal/views/crm_lead_views.xml
@@ -66,4 +66,38 @@
             </xpath>
         </field>
     </record>
+
+    <record id="crm_lead_view_graph_report_forecast" model="ir.ui.view">
+        <field name="name">crm.lead.view.graph.forecast.inherit.website.crm.iap.reveal</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_lead_view_graph_forecast"/>
+        <field name="arch" type="xml">
+            <xpath expr="//graph" position="inside">
+                <field name="reveal_iap_credits" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="crm_lead_view_pivot_forecast" model="ir.ui.view">
+        <field name="name">crm.lead.view.pivot.forecast.inherit.website.crm.iap.reveal</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_lead_view_pivot_forecast"/>
+        <field name="arch" type="xml">
+            <xpath expr="//pivot" position="inside">
+                <field name="reveal_iap_credits" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="crm_opportunity_report_view_pivot_lead" model="ir.ui.view">
+        <field name="name">crm.opportunity.report.view.pivot.lead.inherit.website.crm.iap.reveal</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_opportunity_report_view_pivot_lead"/>
+        <field name="arch" type="xml">
+            <xpath expr="//pivot" position="inside">
+                <field name="reveal_iap_credits" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
 </odoo>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 8ca1e512f08..bbbed2dd1b1 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -101,6 +101,30 @@
             </field>
         </record>
 
+        <record id="crm_opportunity_report_view_pivot_lead" model="ir.ui.view">
+            <field name="name">crm.opportunity.report.view.pivot.lead.inherit.partner_assign</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_opportunity_report_view_pivot_lead"/>
+            <field name="arch" type="xml">
+                <xpath expr="//pivot" position="inside">
+                    <field name="partner_latitude" invisible="1"/>
+                    <field name="partner_longitude" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="crm_lead_view_pivot_forecast" model="ir.ui.view">
+            <field name="name">crm.lead.view.pivot.forecast.inherit.website.crm.partner.assign</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_lead_view_pivot_forecast"/>
+            <field name="arch" type="xml">
+                <xpath expr="//pivot" position="inside">
+                    <field name="partner_latitude" invisible="1"/>
+                    <field name="partner_longitude" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="crm_lead_view_graph" model="ir.ui.view">
             <field name="name">crm.lead.view.graph.inherit.partner.assign</field>
             <field name="model">crm.lead</field>
@@ -113,6 +137,18 @@
             </field>
         </record>
 
+        <record id="crm_lead_view_graph_forecast" model="ir.ui.view">
+            <field name="name">crm.lead.view.graph.forecast.inherit.website.crm.partner.assign</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_lead_view_graph_forecast"/>
+            <field name="arch" type="xml">
+                <xpath expr="//graph" position="inside">
+                    <field name="partner_latitude" invisible="1"/>
+                    <field name="partner_longitude" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="crm_lead_view_graph_report_opportunity" model="ir.ui.view">
             <field name="name">crm.lead.view.graph.report.opportunity.inherit.partner.assign</field>
             <field name="model">crm.lead</field>