From 39cc5535087f95ae3c584a3f05dc25d2e5a8b0e0 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Thu, 15 Apr 2010 18:15:21 +0530
Subject: [PATCH] Revert changes to use name attribute to set dafault on
 fieltrs

bzr revid: hda@tinyerp.com-20100415124521-aq7jqrdf7dc4kdyb
---
 addons/crm/crm_claims_menu.xml                |  2 +-
 addons/crm/crm_claims_view.xml                |  4 ++--
 addons/crm/crm_fund_menu.xml                  |  2 +-
 addons/crm/crm_fund_view.xml                  |  2 +-
 addons/crm/crm_helpdesk_menu.xml              |  2 +-
 addons/crm/crm_helpdesk_view.xml              |  4 ++--
 addons/crm/crm_lead_menu.xml                  |  3 ++-
 addons/crm/crm_lead_view.xml                  |  8 +++----
 addons/crm/crm_meeting_menu.xml               |  2 +-
 addons/crm/crm_meeting_view.xml               |  6 ++---
 addons/crm/crm_opportunity_menu.xml           |  2 +-
 addons/crm/crm_opportunity_view.xml           |  2 +-
 addons/crm/crm_phonecall_menu.xml             |  4 ++--
 addons/crm/crm_phonecall_view.xml             |  8 +++----
 addons/crm/report/crm_claim_report_view.xml   |  2 +-
 .../report/crm_fundraising_report_view.xml    |  2 +-
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../report/crm_opportunity_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 addons/crm/report/crm_report_view.xml         | 11 +++++----
 addons/hr_evaluation/hr_evaluation_view.xml   |  6 ++---
 addons/hr_expense/hr_expense_view.xml         |  4 ++--
 .../report/hr_expense_report_view.xml         |  7 +++---
 addons/hr_recruitment/hr_recruitment_menu.xml |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  4 ++--
 .../report/hr_recruitment_report_view.xml     | 11 ++++-----
 addons/mrp/mrp_view.xml                       | 24 +++++++++----------
 .../mrp/report/mrp_production_order_view.xml  |  6 ++---
 addons/product/report/product_label.xsl       |  1 +
 addons/project/project_view.xml               | 16 ++++++-------
 addons/project/report/project_report_view.xml |  6 ++---
 addons/project_issue/project_issue_menu.xml   |  2 +-
 addons/project_issue/project_issue_view.xml   |  8 +++----
 .../project_long_term_view.xml                |  6 ++---
 .../report/task_report_view.xml               |  4 ++--
 .../purchase/report/purchase_report_view.xml  | 10 ++++----
 addons/resource/resource_view.xml             |  4 ++--
 addons/sale/report/sale_report_view.xml       | 10 ++++----
 addons/sale/sale_view.xml                     |  8 +++----
 addons/scrum/scrum_view.xml                   | 18 +++++++-------
 .../report/report_stock_picking_view.xml      |  6 ++---
 addons/stock/report/report_stock_view.xml     |  6 -----
 addons/stock/stock_view.xml                   | 22 ++++++++---------
 43 files changed, 131 insertions(+), 132 deletions(-)

diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index d2d78d78b54..f235c9ae637 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -13,7 +13,7 @@
 	        <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">{"search_default_section_id":section_id,"search_default_Current":1,"search_default_My Claims":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>	        
 	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
 	    </record>
 
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 326da6c8973..c7409006d78 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -245,7 +245,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current"
+                   <filter icon="gtk-new" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims"
                    />
@@ -263,7 +263,7 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                       <filter icon="terp-partner" string="My Claims"
+                       <filter icon="terp-partner" name="my_claims"
                                domain="[('user_id','=',uid)]" help="My Claims"/>
                            <filter icon="terp-partner"
                                domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index 2694111d82f..c0994aee5cd 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -12,7 +12,7 @@
         <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">{"search_default_My Funds":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_my_funds":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
 
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index c72fd810603..8d315c14a6d 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -252,7 +252,7 @@
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
                        <filter icon="terp-partner" string="My Funds"
-                           domain="[('user_id','=',uid)]"
+                          name="my_funds" domain="[('user_id','=',uid)]"
                            separator="1"
                            help="Funds Related to Current User"
                            />
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index 21ff93c91ec..b1a7dfcc428 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -11,7 +11,7 @@
         <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">{"search_default_My Request":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_my_hd_request":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
 
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index fc731ae30e7..bea0c3a894c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -104,7 +104,7 @@
                                 <separator colspan="4" string="Action Information"/>
                                 <field colspan="4" name="name"/>
                                 <field name="date" select="2"/>
-                                <field name="user_id" select="2"/>
+                                <field name="user_id" select="2"/>                                
                             </form>
                         </field>
                     </page>
@@ -223,7 +223,7 @@
                 <field name="name" select='1' string="Query"/>
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner" string="My Request"
+                    <filter icon="terp-partner" name="my_hd_request" 
                     domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
                 </field>
                 <field name="section_id" select="1" widget="selection" string="Section">
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index eb8c09008fc..8e34bca3118 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -7,7 +7,8 @@
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="context">{"search_default_Current":1,"search_default_My Lead":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d93e5f94562..9dad22dba81 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -45,8 +45,8 @@
                             name="convert_opportunity"
                             string="Convert"
                             help="Convert into Opportunity"
-                            icon="gtk-index"
-                            type="object"
+                            icon="gtk-index"   
+                            type="object"                         
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
@@ -262,7 +262,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-project" name="current"
                     string="Current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
@@ -288,7 +288,7 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
-                        help="My Leads" string="My Lead"
+                        help="My Leads" name="my_lead"
                     />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c65bae2e41e..b376d34c5d9 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -85,7 +85,7 @@
         <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">{"search_default_Current":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_section_id":section_id}</field>
         <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">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index b350812c0f9..b01beb55342 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -259,9 +259,9 @@
                            <filter icon="terp-crm" string="My Meetings"
                            	domain="[('user_id','=',uid)]"
                            	help="My Meetings" />
-                           <filter icon="terp-crm" string="Current"
-                           domain="[('state','in',('draft', 'open'))]"
-                           help="Current Meetings"/>
+                           <filter icon="terp-crm" name="current" string="Current" 
+                           domain="[('state','in',('draft', 'open'))]" 
+                           help="Current Meetings"/>                           
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index c7fba068c11..ba01ca72be4 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,7 +27,7 @@
           <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">{"search_default_My Oprtnit":1,"search_default_Current":1,"search_default_section_id":section_id}</field>
+          <field name="context">{"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id}</field>          
           <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 e0e53f4cd8c..92b09919791 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -281,7 +281,7 @@
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner" string="My Oprtnit"
+                    <filter icon="terp-partner" name="my_oprtnit"
                         domain="[('user_id','=',uid)]"
                         help="My Opportunities" />
                     <filter icon="terp-partner"
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c3547b2023b..9e6678c0834 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -20,7 +20,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -55,7 +55,7 @@
         <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">{"default_state":'open',"search_default_My Calls":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3fefc7ed249..064d3569d03 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -161,7 +161,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <group>
                <filter icon="gtk-home" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
@@ -177,9 +176,9 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner" string="My Calls"
-                       domain="[('user_id','=',uid)]"
-                       help="My Phonecalls"/>
+                   <filter icon="terp-partner" name="my_calls" 
+                       domain="[('user_id','=',uid)]" 
+                       help="My Phonecalls"/>               
                    <filter icon="terp-partner"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
@@ -190,7 +189,6 @@
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My section" />
                </field>
-               </group>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 9be2c7c538e..465fab740a6 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -83,7 +83,7 @@
             <field name="view_type">form</field>
   			<field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
 
         </record>
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index 38068a7b16c..fbc56e6202e 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -80,7 +80,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
-			<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 9ce910329bf..58d69699404 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -79,7 +79,7 @@
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
 
         </record>
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index b19115f6739..3ee8498fb3a 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -88,7 +88,7 @@
             <field name="res_model">crm.opportunity.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
         </record>
       	<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a4fc0f0097f..a78d94977f8 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -77,7 +77,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index a0f03a24210..3cd8b518b5d 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -64,10 +64,12 @@
                 <search string="Search">
                   <group col="16" colspan="8">
                    		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]" />
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			name="this_year" />
 
                    		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />
+                   			domain="[('month','=',time.strftime('%%m'))]"
+                   			name="this_month" />
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-hr"
@@ -104,7 +106,8 @@
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
+                        	domain="[]" context="{'group_by':'user_id'}"
+                        	name="by_user" />
 
                         <filter string="Company" icon="terp-sale"
                         	domain="[]"
@@ -142,7 +145,7 @@
             <field name="res_model">crm.case.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8af9a48b50c..fcd4f9d4bf1 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -311,9 +311,9 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="To Do" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <filter string="My" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        <filter string="My" icon="terp-partner" name="my" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -329,7 +329,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
-            <field name="context">{"search_default_To Do":1,"search_default_My":1}</field>
+            <field name="context">{"search_default_todo":1,"search_default_my":1}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7b18fa14996..855f40633d0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -148,7 +148,7 @@
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection">
                           <filter
-                            icon="gtk-execute" string="My Expns"
+                            icon="gtk-execute" name="my_expns"
                             help="My Expenses"
                             domain="[('user_id','=',uid)]"/>
                           <filter icon="terp-hr"
@@ -172,7 +172,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_My Expns":1}</field>
+            <field name="context">{"search_default_my_expns":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7a3c9b25d18..2f9a0afb29c 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -56,7 +56,8 @@
                 <filter icon="terp-hr"
                     string="Draft"
                     domain="[('state','=','draft')]"/>
-                <filter icon="terp-hr" string="Expenses"
+                <filter icon="terp-hr" name="expenses"
+                    string="Expenses"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancelled')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -70,7 +71,7 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
-                    <filter string="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <filter string="User" name="by_user" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -89,7 +90,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_Expenses":1,"search_default_User":1}</field>
+        <field name="context">{"search_default_expenses":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 88011aa817c..bbf32cf0501 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -9,7 +9,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view_job"/>
-        <field name="context">{"search_default_Current":1,"search_default_My Recrui":1}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_recrui":1}</field>
         <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
 
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 96f8718bf9a..c31b58f74be 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -202,7 +202,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                <group>
-               <filter icon="gtk-new" string="Current"
+               <filter icon="gtk-new" string="Current" name="current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                />
@@ -224,7 +224,7 @@
                <field name="job_id" widget="selection"/>
                <newline/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',uid)]" string="My Recrui" help="My Recruitements" icon="gtk-execute"/>
+                    <filter domain="[('user_id','=',uid)]" name="my_recrui" help="My Recruitements" icon="gtk-execute"/>
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2b8c451949c..286499e0ae8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -39,7 +39,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitments">
-                <group>
                 <filter icon="terp-hr"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
@@ -59,9 +58,8 @@
                         string="My Recruitments"
                         domain="[('user_id','=',uid)]"/>
                 </field>
-                </group>
                 <newline/>
-                <group expand="1" string="Extended options...">
+                <group expand="1" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-hr"
                     		string="Not Good"
                     		domain="[('priority','=','5')]"/>
@@ -78,9 +76,10 @@
                     		string="Excellent"
                     		domain="[('priority','=','1')]"/>
                 </group>
+
                 <newline/>
-                <group expand="1" string="Group By...">
-                   <filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="User" name="by_user" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
                    <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}"/>
                    <separator orientation="vertical"/>
@@ -101,7 +100,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_User":1}</field>
+        <field name="context">{"search_default_user_id":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 10479d82044..cf3a2ac584d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -441,7 +441,7 @@
                     <field name="cycle_total" operator="+"/>
                 </graph>
             </field>
-        </record>
+        </record>        
 
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
@@ -493,7 +493,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
@@ -502,7 +502,7 @@
                                    <tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                    <field name="product_uom" readonly="1" string="UOM"/>
+                                    <field name="product_uom" readonly="1" string="UOM"/>                                    
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                     <field name="prodlot_id" />
                                     <field name="state" invisible="1"/>
@@ -516,8 +516,8 @@
                                            name="%(stock.move_scrap)d"
                                            string="Scrap Products" type="action"
                                            icon="gtk-convert"
-                                           states="done,cancel" />
-
+                                           states="done,cancel" />                                      
+                                    
                                    </tree>
                                </field>
 
@@ -525,13 +525,13 @@
                                 <field name="state" select="2"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
+                                <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>                                
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
                             </group>
-                        </page>
+                        </page>                        
                         <page string="Finished Products">
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
@@ -548,7 +548,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
@@ -618,7 +618,7 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current"
+                       <filter icon="terp-mrp" string="Current" name="current"
                            domain="[('state','in',('confirmed','ready'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
@@ -656,7 +656,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
@@ -852,7 +852,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -878,7 +878,7 @@
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index c358748ba31..8a306d8e79d 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -59,8 +59,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+                   		<filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" name="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="Scheduled Date" icon="terp-hr" domain="[('scheduled_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
@@ -90,7 +90,7 @@
             <field name="res_model">mrp.production.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
         </record>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 81d317c0fb7..85655ff4e6a 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -70,6 +70,7 @@
 				</td>
 			</tr><tr>
 				<td>
+				<barCode><xsl:value-of select="code"/></barCode>
 				</td><td>
 					<para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
 					<para style="nospace"><xsl:value-of select="variant"/></para>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 867c134198b..0990bcc58c8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,11 +110,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" name="open"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." name="member"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
                        <separator orientation="vertical"/>
@@ -152,7 +152,7 @@
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
-            <field name="context">{"search_default_Current":1,"search_default_Member":1}</field>
+            <field name="context">{"search_default_open":1,"search_default_member":1}</field>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@@ -403,7 +403,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -414,7 +414,7 @@
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" string="My Task"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" name="my_task"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -440,7 +440,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_Current":1,"search_default_My Task":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_task":1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@@ -607,7 +607,7 @@
                        <field name="subject"/>
                        <field name="project_id" select="1" widget="selection"/>
                        <field name="user_id" select="1" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" string="My Msg"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
                        </field>
                    </group>
                    <newline/>
@@ -626,7 +626,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
-            <field name="context">{"search_default_My Msg":1}</field>
+            <field name="context">{"search_default_my_msg":1}</field>        
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index bd276e175cc..09a4374b156 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -42,9 +42,9 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="project_id"/>
 	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]"/>
+	                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" name="my_task"/>
 	                    </field>
-                    </group>
+                    </group>                    
                     <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
@@ -64,7 +64,7 @@
             <field name="res_model">report.project.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{"search_default_My Task":1}</field>
+            <field name="context">{"search_default_my_task":1}</field>            
             <field name="search_view_id" ref="view_task_project_user_search"/>
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 8d0601137b5..1fc5c3bce7d 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -14,7 +14,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
-        <field name="context">{"search_default_My Bugs":1,"search_default_Current Bugs":1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6e46b5b50df..b9c0573ea57 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -207,10 +207,10 @@
                     <group>
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" string="My Bugs"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" string="Current Bugs"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project">
@@ -293,10 +293,10 @@
                     <group>
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" string="My Feature"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" string="Current Feature"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d4131c24e05..707e1106ec7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -196,7 +196,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" />
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -205,7 +205,7 @@
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="responsible_id" widget="selection">
-                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" string="My Phase"/>
+                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" name="my_phase"/>
                         </field>
                         <field name="date_start"/>
                     </group>
@@ -225,7 +225,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt</field>
-            <field name="context">{"search_default_Current":1,"search_default_My Phase":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_phase":1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 2f592e648b0..3b10af43026 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -163,7 +163,7 @@
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                	    <filter string="User" name="by_user" icon="terp-project" context="{'group_by':'user_id'}" />
                     	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
                     	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
                 	</group>
@@ -175,7 +175,7 @@
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{"search_default_User":1}</field>
+            <field name="context">{"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
         <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 1e5a355b8f0..06034528a70 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -46,11 +46,11 @@
             <search string="Purchase Orders">
                 <group>
                 <filter icon="terp-purchase"
-                    string="This Year"
+                    string="This Year" name="this_year"
                     domain="[('name','=',time.strftime('%%Y'))]"
                     help="Purchase orders of the year"/>
                 <filter icon="terp-purchase"
-                    string="This Month"
+                    string="This Month" name="this_month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Purchase orders of this month"/>
                 <separator orientation="vertical"/>
@@ -58,7 +58,7 @@
                     string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-purchase"
-                    string="Purchase"
+                    string="Purchase" name="purchase"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -74,7 +74,7 @@
                 <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
                     <filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
@@ -93,7 +93,7 @@
         <field name="res_model">report.purchase.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Purchase":1,"search_default_Responsible":1}</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_purchase_order_search"/>
     </record>
 
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 2a11795109b..8617e8a8f4c 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -13,7 +13,7 @@
                    <group>
                        <field name="name"/>
                        <field name="user_id" string="User" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" string="My Resources"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" name="my_resources"/>
                        </field>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection"/>
@@ -98,7 +98,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_My Resources":1}</field>
+            <field name="context">{"search_default_my_resources":1}</field>
             <field name="search_view_id" ref="view_resource_calendar_search"/>
         </record>
 
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 150542e2c7e..fb0ae387000 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -45,11 +45,11 @@
             <search string="Sale Orders">
                 <group>
                 <filter icon="terp-sale"
-                    string="This Year"
+                    string="This Year" name="this_year"
                     domain="[('year','=',time.strftime('%%Y'))]"
                     help="Sales orders of the year"/>
                 <filter icon="terp-sale"
-                    string="This Month"
+                    string="This Month" name="this_month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Sales orders of this month"/>
                 <separator orientation="vertical"/>
@@ -57,7 +57,7 @@
                     string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-sale"
-                    string="Sales"
+                    string="Sales" name="sales"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="user_id" widget="selection">
@@ -73,7 +73,7 @@
                 <group expand="1" string="Group By..." >
                     <filter string="Company" icon="terp-sale" context="{'group_by':'company_id'}"/>
                     <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" context="{'group_by':'user_id'}" />
+                    <filter string="Salesman" name="by_user" icon="terp-sale" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
@@ -91,7 +91,7 @@
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Sales":1,"search_default_Salesman":1}</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_order_product_search"/>
     </record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5ea7546def9..fd55e6587a8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -261,7 +261,7 @@
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
+                        <filter icon="terp-partner" name="my_sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
@@ -281,7 +281,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{"search_default_My Sale":1}</field>
+            <field name="context">{"search_default_my_sale":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
@@ -448,7 +448,7 @@
                     <filter icon="terp-purchase" string="Shipped"
                         domain="[('state','=','done')]"
                         separator="1" />
-                    <filter icon="terp-purchase" string="Uninvoiced"
+                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         separator="1" />
                     <separator orientation="vertical"/>
@@ -473,7 +473,7 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{"search_default_Uninvoiced":1}</field>
+            <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 45415c8b2aa..07e839bd71c 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -100,7 +100,8 @@
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
-                        <filter icon="terp-project"
+                        <filter name="current"
+                            icon="terp-project"
                             string="Current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
                             help="Current Backlogs"/>
@@ -114,7 +115,8 @@
                             />
                         <field name="sprint_id"/>
                         <field name="user_id" widget="selection">
-                            <filter icon="terp-project"
+                            <filter name="my_features"
+                                icon="terp-project"
                                 string="My Features"
                                 domain="[('user_id','=',uid)]"
                                 help="My Backlogs"/>
@@ -136,7 +138,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_Current":1,"search_default_My Features":1,"search_default_project_id":project_id}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_features":1,"search_default_project_id":project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -228,14 +230,14 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <filter name="current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
                         <field name="scrum_master_id" widget="selection">
-                            <filter icon="gtk-execute" string="My Sprints" domain="[('scrum_master_id','=',uid)]"
+                            <filter icon="gtk-execute" name="my_sprints" domain="[('scrum_master_id','=',uid)]"
                                 help="My Sprints"/>
                         </field>
                         <field name="date_start"/>
@@ -259,7 +261,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
-            <field name="context">{"search_default_Current":1,"search_default_My Sprints":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_sprints":1}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
@@ -322,7 +324,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="sprint_id">
-                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                            <filter icon="terp-project" name="current" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
                         <field name="date"/>
                     </group>
@@ -340,7 +342,7 @@
             <field name="res_model">scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
         <menuitem sequence="30"
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 9c1acc1fb31..f8ce77cd7d0 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -57,8 +57,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
-                        <filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
+                        <filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
+                        <filter string="This Month" name="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="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%Y-%%m-%%d'))]"  />
@@ -99,7 +99,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-            <field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
         </record>
 
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index dd078bc68e0..ec15f123864 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,15 +9,9 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-<<<<<<< TREE
                         <filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
                         <filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-=======
-                        <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
-                        <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
->>>>>>> MERGE-SOURCE
 
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c05e16a6ea0..34dea11b9cd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -264,7 +264,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix" select="1"/>
                         <field name="name" select="1"/>
@@ -287,7 +287,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
-            <field name="context">{'full':'1',"search_default_Available":1}</field>
+            <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
 
@@ -695,7 +695,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
@@ -852,7 +852,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
@@ -878,7 +878,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -1225,7 +1225,7 @@
             <field name="arch" type="xml">
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
                         <separator orientation="vertical"/>
@@ -1251,7 +1251,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1281,7 +1281,7 @@
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
+                        <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="origin" select="1"/>
@@ -1304,7 +1304,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
@@ -1513,7 +1513,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
@@ -1539,7 +1539,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_To Receive":1}</field>
+            <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>