From ef7ad79d565aaabd9b414742c0d9ed2e62e78339 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 4 Mar 2010 16:27:55 +0530
Subject: [PATCH] [IMP]report_crm : Improve the search view

bzr revid: sbh@tinyerp.com-20100304105755-bx711ps3cehhj9hz
---
 addons/report_crm/report_crm_claim_view.xml   |  5 +--
 addons/report_crm/report_crm_lead_view.xml    |  4 ++-
 .../report_crm_opportunity_view.xml           |  5 +--
 .../report_crm/report_crm_phonecall_view.xml  | 36 ++-----------------
 addons/report_crm/report_crm_view.xml         |  1 -
 5 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml
index 8a9aa3d0273..8232d72792b 100644
--- a/addons/report_crm/report_crm_claim_view.xml
+++ b/addons/report_crm/report_crm_claim_view.xml
@@ -55,8 +55,9 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
-               </field>
+             <xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
+                <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+            </xpath>
             </field>
         </record>
         
diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml
index 4ce37467409..027238cc279 100644
--- a/addons/report_crm/report_crm_lead_view.xml
+++ b/addons/report_crm/report_crm_lead_view.xml
@@ -55,7 +55,9 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                  <field name="user_id" position="before"/>
+			<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
+					<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+            	</xpath>
             </field>
         </record>
        	
diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml
index 9b2712ef57b..b4f149d3cfe 100644
--- a/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@ -61,8 +61,9 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
-               </field>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
+        	        <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+	            </xpath>
             </field>
         </record>
         
diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml
index e74a2d05fe4..5e7395b3d1a 100644
--- a/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -54,40 +54,10 @@
             <field name="model">report.crm.phonecall</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="8">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>	
-						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
-						<separator orientation="vertical"/>	
-						<field name="section_id" default="context.get('section_id', False)" widget="selection"
-                    				context="{'invisible_section': False}">
-                   		 <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
-                        </field>
-                         <field name="user_id" widget="selection">
-                    	<filter icon="terp-partner"
-                        	domain="[('user_id','=',uid)]"
-                        	help="My Phonecall " default="1"
-                    	/>
-                </field>
-                   </group>
-                   <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
-                    	<filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
-                   </group>
-               </search>
+                 <field name="user_id" position="before">
+               </field>
             </field>
+
         </record>       
         
         <record id="action_report_crm_phonecall" model="ir.actions.act_window">
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 61fe7766ddf..b69ee89548b 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -79,7 +79,6 @@
                         <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
                     	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
                     	<filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>