From e21539cb88bb8603b111def1f33b0bb30f1498a3 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 31 Dec 2013 11:53:48 +0100
Subject: [PATCH] [IMP] removes old tree view in reporting/crm and replaces
 them by the new graph view in pivot mode by default (addon crm)

bzr revid: ged@openerp.com-20131231105348-dzcv1rriy3dwqk54
---
 addons/crm/report/crm_lead_report_view.xml    | 94 ++-----------------
 .../crm/report/crm_phonecall_report_view.xml  | 41 +-------
 2 files changed, 12 insertions(+), 123 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 59cfd5f8fc6..8115e74e71b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -2,46 +2,15 @@
 <openerp>
     <data>
 
-<!-- Leads by user and section Tree View -->
-
-        <record id="view_report_crm_lead_tree" model="ir.ui.view">
-            <field name="name">crm.lead.report.tree</field>
-            <field name="model">crm.lead.report</field>
-            <field name="arch" type="xml">
-            <tree string="Leads Analysis" create="false">
-                <field name="creation_year" invisible="1"/>
-                <field name="creation_month" invisible="1"/>
-                <field name="creation_day" invisible="1"/>
-                <field name="deadline_month" invisible="1"/>
-                <field name="date_last_stage_update" invisible="1"/>
-                <field name="stage_id"  invisible="1"/>
-                <field name="type_id" invisible="1"/>
-                <field name="channel_id" invisible="1"/>
-                <field name="type" invisible="1"/>
-                <field name="priority" invisible="1"/>
-                <field name="section_id" invisible="1"
-                        groups="base.group_multi_salesteams"/>
-                <field name="user_id" invisible="1"/>
-                <field name="company_id" invisible="1"/>
-                <field name="partner_id" invisible="1"/>
-                <field name="country_id" invisible="1"/>
-                <field name="nbr" sum="# Leads"/>
-                <field name="delay_open"/>
-                <field name="delay_close"/>
-                <field name="planned_revenue"/>
-             </tree>
-            </field>
-        </record>
-
 <!-- Leads by user and section Graph View -->
 
         <record id="view_report_crm_lead_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-                <graph string="Leads Analysis" type="bar" stacked="True">
-                    <field name="stage_id" type="row"/>
-                    <field name="user_id" type="col"/>
+                <graph string="Leads Analysis" type="pivot" stacked="True">
+                    <field name="user_id" type="row"/>
+                    <field name="creation_month" type="row"/>
                     <field name="nbr" type="measure"/>
                 </graph>
             </field>
@@ -51,9 +20,9 @@
             <field name="name">crm.opportunity.report.graph</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-                <graph string="Leads Analysis" type="bar" stacked="True">
-                    <field name="stage_id" type="row"/>
-                    <field name="user_id" type="col"/>
+                <graph string="Leads Analysis" type="pivot" stacked="True">
+                    <field name="user_id" type="row"/>
+                    <field name="creation_month" type="row"/>
                     <field name="planned_revenue" type="measure"/>
                 </graph>
             </field>
@@ -125,40 +94,6 @@
             </field>
         </record>
 
-<!--     Opportunity tree view  -->
-
-        <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
-            <field name="name">crm.lead.report.tree</field>
-            <field name="model">crm.lead.report</field>
-            <field name="arch" type="xml">
-            <tree create="false" string="Opportunities Analysis">
-                <field name="creation_year" invisible="1"/>
-                <field name="creation_month" invisible="1"/>
-                <field name="creation_day" invisible="1"/>
-                <field name="deadline_month" invisible="1"/>
-                <field name="section_id" invisible="1"
-                        groups="base.group_multi_salesteams"/>
-                <field name="user_id" invisible="1"/>
-                <field name="partner_id" invisible="1"/>
-                <field name="country_id" invisible="1"/>
-                <field name="stage_id"  invisible="1"/>
-                <field name="priority"  invisible="1"/>
-                <field name="type_id" invisible="1"/>
-                <field name="channel_id" invisible="1"/>
-                <field name="type" invisible="1"/>
-                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
-                <field name="planned_revenue" sum="Planned Revenues"/>
-                <field name="delay_open" sum='Delay to Assign'/>
-                <field name="delay_close" sum='Delay to close'/>
-                <field name="date_last_stage_update"/>
-                <field name="delay_expected"/>
-                <field name="probability" widget="progressbar"/>
-                <field name="probable_revenue"/>
-             </tree>
-            </field>
-        </record>
-
 <!-- Leads by user and section Action -->
 
        <record id="action_report_crm_lead" model="ir.actions.act_window">
@@ -166,16 +101,10 @@
            <field name="res_model">crm.lead.report</field>
            <field name="view_type">form</field>
            <field name="context">{'search_default_year': 1, "search_default_user":1, "search_default_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
-           <field name="view_mode">tree,graph</field>
+           <field name="view_mode">graph</field>
            <field name="domain">[('type','=', 'lead')]</field>
            <field name="help">Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
        </record>
-       <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_crm_lead_tree"/>
-            <field name="act_window_id" ref="action_report_crm_lead"/>
-       </record>
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
@@ -188,18 +117,11 @@
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_year":1, "search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
             <field name="domain">[('type','=', 'opportunity')]</field>
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
 
-       <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_crm_opportunity_tree"/>
-            <field name="act_window_id" ref="action_report_crm_opportunity"/>
-       </record>
-
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 08428858e98..9de9adeade3 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -2,41 +2,15 @@
 <openerp>
     <data>
 
-<!-- Phone calls by user and section Tree View -->
-
-        <record id="view_report_crm_phonecall_tree" model="ir.ui.view">
-            <field name="name">crm.phonecall.report.tree</field>
-            <field name="model">crm.phonecall.report</field>
-            <field name="arch" type="xml">
-                <tree string="Phone calls" create="false">
-                    <field name="name" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="section_id" invisible="1"
-                            groups="base.group_multi_salesteams"/>
-                    <field name="priority" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="categ_id" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="nbr" string="#Phone calls" sum="#Phone calls"/>
-                    <field name="duration" avg="Duration"/>
-                    <field name="delay_close" avg="Avg Closing Delay"/>
-                    <field name="delay_open" sum='Delay to Assign'/>
-              </tree>
-            </field>
-        </record>
-
 <!-- Phone calls by user and section Graph View -->
 
         <record id="view_report_crm_phonecall_graph" model="ir.ui.view">
             <field name="name">crm.phonecall.report.graph</field>
             <field name="model">crm.phonecall.report</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Phone calls" type="bar" stacked="True">
+                <graph orientation="horizontal" string="Phone calls" type="pivot" stacked="True">
                     <field name="user_id" type="row"/>
-                    <field name="state" type="col"/>
+                    <!-- <field name="state" type="col"/> -->
                     <field name="nbr" type="measure"/>
                 </graph>
             </field>
@@ -92,20 +66,13 @@
             <field name="name">Phone Calls Analysis</field>
             <field name="res_model">crm.phonecall.report</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
             <field name="context">{"search_default_year":1,"search_default_Salesperson":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="view_id" ref="view_report_crm_phonecall_tree"/>
+            <field name="view_id" ref="view_report_crm_phonecall_graph"/>
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
             <field name="help">From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report.</field>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-            <field name="act_window_id" ref="action_report_crm_phonecall"/>
-        </record>
-
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>