From 0ad1789736d14fc7b0797746fa511aa8d21c4f75 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 30 Apr 2014 01:39:09 +0200
Subject: [PATCH] [FIX] crm report revert the split of opportunity and leads
 Partialy revert 9007 tde@openerp.com-20131205160029-1tljp52ovcavwxel,
 restoring the default_search context instead of domain, restoring the
 analysis encompassing both leads and opportunities lifecycle.

bzr revid: al@openerp.com-20140429233909-fy9y85tsnjs262tl
---
 addons/crm/report/crm_lead_report_view.xml | 60 ++++++++++------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c4cffdc012a..1dda471c2f2 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <graph string="Leads Analysis" type="pivot" stacked="True">
                     <field name="user_id" type="row"/>
-                    <field name="create_date" interval="week" type="col"/>
+                    <field name="create_date" interval="year" type="col"/>
                 </graph>
             </field>
         </record>
@@ -32,7 +32,6 @@
             <field name="arch" type="xml">
                 <graph string="Leads Analysis" type="pivot" stacked="True">
                     <field name="date_deadline" type="row"/>
-                    <field name="user_id" type="col"/>
                     <field name="stage_id" type="col"/>
                     <field name="planned_revenue" type="measure"/>
                 </graph>
@@ -46,6 +45,9 @@
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
+                    <filter name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
+                    <filter name="opportunity" string="Opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
+                    <separator/>
                     <filter string="New" name="new"
                             domain="[('probability', '=', 0), ('stage_id.sequence', '=', 1)]"/>
                     <filter string="Won" name="won"
@@ -78,43 +80,37 @@
                         <field name="date_closed"/>
                     </group>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start"
-                            domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Country" context="{'group_by':'country_id'}" />
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Priority" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Campaign" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Creation date (day)" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'create_date:day'}"/>
-                        <filter string="Creation date (week)" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'create_date:week'}"/>
-                        <filter string="Creation date (month)" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'create_date:month'}" name="month"/>
-                        <filter string="Creation date (year)" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'create_date:year'}"/>
+                        <filter string="Creation date (day)" domain="[]" context="{'group_by':'create_date:day'}"/>
+                        <filter string="Creation date (week)" domain="[]" context="{'group_by':'create_date:week'}"/>
+                        <filter string="Creation date (month)" domain="[]" context="{'group_by':'create_date:month'}" name="month"/>
+                        <filter string="Creation date (year)" domain="[]" context="{'group_by':'create_date:year'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Exp. Closing"  icon="terp-go-month"
-                            domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Exp. Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
                     </group>
                 </search>
             </field>
         </record>
 
-<!-- Leads by user and section Action -->
-
+        <!-- Leads by user and section Action -->
        <record id="action_report_crm_lead" model="ir.actions.act_window">
            <field name="name">Leads Analysis</field>
            <field name="res_model">crm.lead.report</field>
            <field name="view_type">form</field>
            <field name="view_mode">graph</field>
-           <field name="domain">[('type','=', 'lead')]</field>
+           <field name="context">{'search_default_lead': 1}</field>
+           <field name="domain">[]</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_graph">
@@ -123,27 +119,25 @@
             <field name="view_id" ref="view_report_crm_lead_graph"/>
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
+       <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
+            groups="base.group_sale_manager"
+            parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/>
 
        <record id="action_report_crm_opportunity" model="ir.actions.act_window">
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
-            <field name="domain">[('type','=', 'opportunity')]</field>
+            <field name="context">{'search_default_opportunity': 1}</field>
+            <field name="domain">[]</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_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_report_crm_opportunity_graph"/>
             <field name="act_window_id" ref="action_report_crm_opportunity"/>
        </record>
-
-       <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-            groups="base.group_sale_manager"
-            parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/>
-
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
             parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/>