From de47896f721d116faee5e98e11ea5ac973c984b0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Fri, 5 Feb 2010 19:40:26 +0530
Subject: [PATCH] [IMP]: crm: Removed default state context, Improved search
 view for Current..

bzr revid: rpa@openerp.co.in-20100205141026-l8qwdgaeqjh3nzf6
---
 addons/crm/crm_claims_menu.xml      | 1 -
 addons/crm/crm_claims_view.xml      | 6 +++---
 addons/crm/crm_fund_menu.xml        | 1 -
 addons/crm/crm_fund_view.xml        | 2 +-
 addons/crm/crm_helpdesk_menu.xml    | 1 -
 addons/crm/crm_helpdesk_view.xml    | 2 +-
 addons/crm/crm_lead_view.xml        | 2 +-
 addons/crm/crm_meeting_menu.xml     | 6 ++----
 addons/crm/crm_meeting_view.xml     | 2 +-
 addons/crm/crm_opportunity_menu.xml | 1 -
 addons/crm/crm_opportunity_view.xml | 2 +-
 addons/crm/crm_phonecall_menu.xml   | 2 --
 addons/crm/crm_phonecall_view.xml   | 2 +-
 addons/crm/crm_view.xml             | 2 +-
 14 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index 211c632a804..e50b984f8e3 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -10,7 +10,6 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>        
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 5f7e9b07fdc..86387ec015d 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -177,9 +177,9 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                    <group col="4" colspan="1">
-                       <filter icon="gtk-new" string="New Claims"
-                       	domain="[('state','=','draft')]"
-                       	separator="1" help="New Claims"
+                       <filter icon="gtk-new" string="Current Claims"
+                       	domain="[('state','in',('draft', 'open'))]"
+                       	separator="1" help="Current Claims" default="1"
                        />
                        <filter icon="gtk-execute"
                        	string="In Progress Claims"
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index 57353e2c6ac..5d815c9b95d 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -8,7 +8,6 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 96b0ac51ad9..077b45af6ff 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -188,7 +188,7 @@
                        	help="Funds Related to Current User"
                        />
                        <field name="state" select="1">
-                           <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Funds"/>
+                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Funds" default="1"/>
                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Funds"/>
                            <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Funds"/>
                        </field>
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index d3bce9dcb2e..29684e5d1de 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -9,7 +9,6 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>        
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index c747f8c3d36..71274822f9c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -180,7 +180,7 @@
 	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Helpdesk Requests" default="1"/>
                    </field>
                    <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current " default="1"/>
                    </field>
 					<field name="section_id" select="1" widget="selection" string="Section">
 						<filter icon="terp-crm"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 15caa58b34e..ede549d7c9f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -177,7 +177,7 @@
                            />
                    </field>
                    <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads"/>
+                       <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
                    </field>
 					<field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 34d03979897..a4c894d7a0a 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -13,7 +13,7 @@
 
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
-        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="context" eval="{'default_state':'draft'}"/>
     </record>
 
 
@@ -52,7 +52,7 @@
         />
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
-        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="context" eval="{'default_state':'draft'}"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
@@ -84,7 +84,6 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
@@ -142,7 +141,6 @@
         <field name="view_mode">tree,calendar,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="domain" eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
         <field name="sequence" eval="2"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index cd3cce574d5..07bdd9438cd 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -162,7 +162,7 @@
             	<search string="Search Meetings">
                		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" help="Draft Meetings"/>
+	               		<filter icon="terp-crm" string="Draft" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index dfc21212b3e..a9cae6bc916 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -28,7 +28,6 @@
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="context" eval="{'default_state':'open'}"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index db6869e0c1e..faf829e5e51 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -211,7 +211,7 @@
                    </field>
                    <field name="partner_id" select="1"/>
                    <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current "/>
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
                    </field>
 					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
 						<filter icon="terp-crm"
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 25f6ee0c1be..4bb8f0aaabb 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -49,7 +49,6 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
@@ -78,7 +77,6 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c6c16cf6600..f64cf5fda54 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -166,7 +166,7 @@
 	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
                    </field>
                    <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current " default="1"/>
                    </field>
 					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
 						<filter icon="terp-crm"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 37270ec03c1..fe29f3125d8 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -434,7 +434,7 @@
                            default="1" help="Cases Related to Current User"
                        />
                        <field name="state" select="1">
-                           <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Cases"/>
+                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Cases"/>
                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Cases"/>
                            <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Cases"/>
                        </field>