From 107af72dd1199a72292610d13a8db63ab653683d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 14:33:52 +0530
Subject: [PATCH 001/161] [IMP] account : added missing filter string in search
 view.

bzr revid: mdi@tinyerp.com-20120521090352-ntkqob7jqzuxkkom
---
 addons/account/account_view.xml                             | 4 ++--
 addons/account/project/project_view.xml                     | 6 +++---
 .../account/report/account_analytic_entries_report_view.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 37b2d42d9c6..1e7f82fe91d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1235,7 +1235,7 @@
                         <field name="date"/>
                         <field name="account_id"/>
                         <field name="partner_id">
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter string="Next Partner Entries to reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
@@ -2213,7 +2213,7 @@
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
                       <group>
-                          <field name="name"/>
+                        <field name="name"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
                       </group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 648af6dda4c..72a47d6c820 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -433,10 +433,10 @@
                 <search string="Analytic Entries Stats">
                     <group>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-                           <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-                           <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
-                           <field name="month"/>
+                        <field name="month"/>
                         <field name="account_id"/>
                     </group>
                 </search>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 408e76fdcb9..3dce53d8685 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -63,7 +63,7 @@
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id">
-                    <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     </field>
                 </group>
                 <newline/>

From 1180e5d1cadb955509a29e2a44df53573c35276e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 14:41:20 +0530
Subject: [PATCH 002/161] [IMP] account_analytic_analysis : added missing
 filter string in search view.

bzr revid: mdi@tinyerp.com-20120521091120-3uajgp1kc5p10cfz
---
 .../account_analytic_analysis_menu.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 964383246dd..54c8323d996 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -34,10 +34,10 @@
                         <separator orientation="vertical"/>
                         <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                         <field name="partner_id">
-                            <filter help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                            <filter string="Partner set on analytic account" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                         </field>
                         <field name="user_id">
-                            <filter help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                            <filter string="Contracts not assigned to an account manager" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         </field>
 
                     </group>

From c933291f700bed1e69ba0517d4a91584c6af362f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:01:30 +0530
Subject: [PATCH 003/161] [IMP] caldav : added missing filter string in search
 view.

bzr revid: mdi@tinyerp.com-20120521093130-oau0k8d0r71crd98
---
 addons/caldav/caldav_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index b47e093d436..2819884aa7b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -157,7 +157,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="user_id" widget="selection">
-                        <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
+                        <filter  string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     </field>
                     <field name="collection_id"/>
                 </search>

From cd5c913576d8a06ef66f7e9ad5c8f8bb58e14eed Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:28:47 +0530
Subject: [PATCH 004/161] [IMP] crm : added missing filter string and improve
 indentation in search view.

bzr revid: mdi@tinyerp.com-20120521095847-y7hcgl7v2byi7vpi
---
 addons/crm/crm_lead_view.xml                  | 20 +++++---
 addons/crm/crm_meeting_view.xml               |  6 ++-
 addons/crm/crm_phonecall_view.xml             | 12 +++--
 addons/crm/crm_report_view.xml                | 51 +++++++++----------
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  3 +-
 6 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c3bd07562c..9f86b4b16dd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -349,25 +349,28 @@
                 <field name="name" string="Lead / Customer"
                     filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id">
-                    <filter icon="terp-personal-"
+                    <filter string="Unassigned Leads"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
                 <field name="subjects"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">
-                    <filter icon="terp-personal+"
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
-                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                    <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
                 <newline/>
                 <group expand="0" string="Group By...">
@@ -597,18 +600,21 @@
                 <field name="name" string="Opportunity / Customer"
                     filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                 <field name="user_id">
-                    <filter icon="terp-personal-"
+                    <filter string="Unassigned Opportunities"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
                     context="{'invisible_section': False}"
                     widget="selection">
-                    <filter icon="terp-personal+"
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
                         domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
                         help="My Sales Team(s)" />
-                    <filter icon="terp-personal+"
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 24799e97421..7ada27c40db 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -278,12 +278,14 @@
                            <field name="name" string="Meeting / Partner"
                                filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
                            <field name="user_id">
-                               <filter icon="terp-personal"
+                               <filter string="My Meetings"
+                                   icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
                            </field>
                            <field name="section_id" widget="selection">
-                               <filter icon="terp-personal+"
+                               <filter string="My Sales Team(s)"
+                                   icon="terp-personal+"
                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index af49956eda8..ec03b9d11ea 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -204,13 +204,15 @@
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
-                   <filter icon="terp-personal-"
+                   <filter string="Unassigned Phonecalls"
+                       icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
                    widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
+                   <filter string="My Sales Team(s)"
+                       icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
@@ -254,13 +256,15 @@
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
-                   <filter icon="terp-personal-"
+                   <filter string="Unassigned Phonecalls"
+                       icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
                    widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
+                   <filter string="My Sales Team(s)"
+                       icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index e89e0c1a8d8..74443b135aa 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -163,13 +163,13 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Stage for this month" />
-                           <separator orientation="vertical"/>
+                        <filter string="This Year" icon="terp-go-year"
+                            domain="[('name','=',time.localtime()[0])]"
+                            help="Cases by Team and Stage for this year" />
+                        <filter string="This Month" icon="terp-go-month"
+                            domain="[('month','=',time.localtime()[1])]"
+                            help="Cases by Team and Stage for this month" />
+                        <separator orientation="vertical"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -238,19 +238,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section, Category and Stage for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <filter string="This Year" icon="terp-go-year"
+                            domain="[('name','=',time.localtime()[0])]"
+                            help="Cases by Section, Category and Stage for this year" />
+                        <filter string="This Month" icon="terp-go-month"
+                            domain="[('month','=',time.localtime()[1])]"
+                            help="Cases by Section, Category and Stage for this month" />
+                        <separator orientation="vertical"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-
-                   </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -332,18 +331,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by User for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <filter string="This Year" icon="terp-go-year"
+                            domain="[('name','=',time.localtime()[0])]"
+                            help="Cases by User for this year" />
+                        <filter string="This Month" icon="terp-go-month"
+                            domain="[('month','=',time.localtime()[1])]"
+                            help="Cases by User for this month" />
+                        <separator orientation="vertical"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-                   </group>
+                    </group>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e012d4745e4..3d91e65e540 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -114,7 +114,7 @@
                         <separator orientation="vertical" />
                         <field name="section_id"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ea210ddc85a..bd4453d6a02 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -78,7 +78,8 @@
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />

From 335811467eaf3b098baa4f6b4a3932a315d4836e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:35:01 +0530
Subject: [PATCH 005/161] [IMP] crm_claim : added missing filter string and
 improve indentation in search view.

bzr revid: mdi@tinyerp.com-20120521100501-lnrlz8vmgxneold3
---
 addons/crm_claim/crm_claim_view.xml               | 7 ++++---
 addons/crm_claim/report/crm_claim_report_view.xml | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 03639fc10e4..48fc4e467a4 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -214,9 +214,10 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                            <filter icon="terp-personal-"
-                                domain="[('user_id','=', False)]"
-                                help="Unassigned Claims" />
+                        <filter string="Unassigned Claims"
+                            icon="terp-personal-"
+                            domain="[('user_id','=', False)]"
+                            help="Unassigned Claims" />
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index a100747690e..411963dbb63 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -82,14 +82,16 @@
                         <field name="section_id" string="Sales Team"
                             context="{'invisible_section': False}">
 
-                            <filter icon="terp-personal+"
+                            <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
 
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                            <filter string="My company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>

From 97380cb20832f6938d82e5848ea137522610f0ca Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:40:36 +0530
Subject: [PATCH 006/161] [IMP] crm_fundraising : added missing filter string
 in search view.

bzr revid: mdi@tinyerp.com-20120521101036-goz84yxanmvkaiss
---
 addons/crm_fundraising/crm_fundraising_view.xml             | 6 ++++--
 .../crm_fundraising/report/crm_fundraising_report_view.xml  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..636b12749e0 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -228,12 +228,14 @@
                                 string="Fund Description" />
                             <field name="user_id"
                                 widget="selection">
-                                <filter icon="terp-personal-"
+                                <filter string="Unassigned"
+                                    icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
                             <field name="section_id" widget="selection" string="Sales Team">
-                                <filter icon="terp-personal+"
+                                <filter string="My Sales Team(s)"
+                                    icon="terp-personal+"
                                     domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My Sales Team(s)" />
                             </field>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 4a0323ff4da..583dfd1e9d5 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -101,13 +101,15 @@
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                            <filter string="My company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>

From a3a7ec567f966a194f5987b0b01e6e53d0bcf4e4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:57:41 +0530
Subject: [PATCH 007/161] [IMP] crm_helpdesk : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120521102741-j36and6ks2yh0ged
---
 addons/crm_helpdesk/crm_helpdesk_view.xml               | 3 ++-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 48681357660..2e204f9a229 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -231,7 +231,8 @@
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                            icon="terp-personal+"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
                     </field>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 64d54fc8cd9..34f07c35ebf 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -75,13 +75,15 @@
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter string="My Sales Team(s)"
+                            icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                            <filter string="My company"
+                            icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>

From 21ae3b0f3fe60093381037b4413433d40edd7d56 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 16:14:56 +0530
Subject: [PATCH 008/161] [IMP] document : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120521104456-wejghmrlrb0pq5ud
---
 addons/document/document_view.xml               | 9 +++++----
 addons/document/report/document_report_view.xml | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f774dd2f3c9..d9e59b6a2a8 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -294,10 +294,11 @@
             <field name="arch" type="xml">
                 <field name="create_uid" position="replace">
                     <field name="user_id">
-                            <filter icon="terp-personal"
-                                domain="[('user_id','=',uid)]"
-                                help="Filter on my documents" />
-                        </field>
+                        <filter string="My Document(s)"
+                            icon="terp-personal"
+                            domain="[('user_id','=',uid)]"
+                            help="Filter on my documents" />
+                    </field>
                     <field name="parent_id" />
                     <field name="index_content"/>
                 </field>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e6e1847cd56..0333e8aca15 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,7 +41,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group>
+                    <group>
                         <separator orientation="vertical"/>
                             <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
                             <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
@@ -50,7 +50,7 @@
                             <field name="month"/>
                             <field name="user"/>
                             <field name="directory"/>
-                        </group>
+                    </group>
                </search>
             </field>
         </record>

From 3a07843c6e9ef40fb2559a8242ebf7c94f6ba1e4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 16:33:10 +0530
Subject: [PATCH 009/161] [IMP] hr_expense : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120521110310-anod47oajf9c3y6c
---
 addons/hr_expense/hr_expense_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a62a9026ecf..e54e38e429a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -148,8 +148,8 @@
                       <field name="employee_id"/>
                       <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
-                    </field>
+                          <filter string="My Department" icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
+                      </field>
                       <field name="name"/>
                       <field name="user_id"  string="User">
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"

From 3d3810ce52ff8d6a1bfc98a49ba3360034b9c5d4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 16:37:23 +0530
Subject: [PATCH 010/161] [IMP] hr_holidays : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120521110723-60b2zyu784pwxdp0
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8f998cbd9..a311ca971f7 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -19,10 +19,10 @@
                          help="Holidays during last month"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                            <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                         </field>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
+                            <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>

From 2a9cdd4954b034d995a7f591fea514d6ef312246 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 16:46:00 +0530
Subject: [PATCH 011/161] [IMP] hr_recruitment : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120521111600-abzff3nqkgfpw6nk
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5d175bd16f5..93bb581d894 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -193,7 +193,7 @@
                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
+                    <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
                </field>
                <newline/>
                 <group expand="0" string="Group By...">

From f81c4b643f9d88eb6d2826035c77918028a7f950 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 16:52:22 +0530
Subject: [PATCH 012/161] [IMP] hr_timesheet_sheet : added missing filter
 string in search view.

bzr revid: mdi@tinyerp.com-20120521112222-3wwe0xowfr8ykgyk
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..f4e722f0b7b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -166,7 +166,8 @@
                         <field name="employee_id"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+"
+                            <filter string="My Departments Timesheet"
+                                icon="terp-personal+"
                                 domain="[('department_id','=',context.get('department_id',False))]"
                                 help="My Departments Timesheet"/>
                         </field>

From 41a5c186e47021d1a30d123e62f3dcd9619506f2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 21 May 2012 18:20:14 +0530
Subject: [PATCH 013/161] [IMP]all: remved default filters and select=1

bzr revid: mma@tinyerp.com-20120521125014-7hf0ir1j11f3pc6b
---
 addons/crm/crm_lead_menu.xml                              | 2 +-
 addons/hr/hr_view.xml                                     | 2 +-
 addons/hr_payroll/hr_payroll_view.xml                     | 2 +-
 addons/hr_recruitment/hr_recruitment_menu.xml             | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml     | 2 +-
 addons/project_issue/project_issue_menu.xml               | 1 -
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 addons/project_long_term/project_long_term_view.xml       | 2 +-
 addons/purchase/purchase_view.xml                         | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3cd45fd5cd1..676e6b1d1ab 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -66,7 +66,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
           <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4147ebc30a9..59bf944db8e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -109,7 +109,7 @@
                     <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids" select="1"/>
+                    <field name="category_ids"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 3e993ad6629..3312c8d3d99 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -650,7 +650,7 @@
                 <search string="Search Salary Rule">
                     <group col="8" colspan="4">
                         <field name="name"/>
-                        <field name="code" select="1"/>
+                        <field name="code"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 04d73dcd2a8..6b43c06824d 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field>            
+            <field name="context">{"search_default_department_id": department_id}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..284208ac1b6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -252,7 +252,7 @@
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
                 <field name="action" position="after">
-                    <field name="sheet_id" select="1" />
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 1c4cecfe439..8044d149901 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,6 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 1695fa3469a..3e42bde9f2e 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -81,7 +81,7 @@
                            <separator orientation="vertical" />
 
                           <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="user_id" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e1b58745a6..945ffa77f0e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -327,7 +327,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
-                    <field name="phase_id" select="1"/>
+                    <field name="phase_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9743fb58a7b..8f2ce36b203 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -318,7 +318,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_approved': 1}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>

From faeb8865d2d1f07c41a3ec13a6c6436c4bd74db2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 10:50:01 +0530
Subject: [PATCH 014/161] [IMP] account : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522052001-zfuetczlp7ojm5gt
---
 addons/account/project/project_view.xml            |  3 ---
 .../account/report/account_invoice_report_view.xml | 14 +-------------
 addons/account/report/account_report_view.xml      |  6 ------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 72a47d6c820..46bcbb110ab 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -432,9 +432,6 @@
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
                     <group>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 6e5f83a83d1..687f98be59f 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,19 +56,6 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -103,6 +90,7 @@
                    <field name="partner_id"/>
                    <field name="user_id" />
                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                   <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index fe2b8a3940a..2c6a8736522 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -149,9 +149,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-					<separator orientation="vertical"/>
 					<field name="name"/>
 					<field name="month"/>
                </search>
@@ -215,9 +212,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-					<separator orientation="vertical"/>
 					<field name="name"/>
 					<field name="month"/>
                </search>

From ec31f3775a6d795f637f0c16e0e637b712b0b6a5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 10:54:55 +0530
Subject: [PATCH 015/161] [IMP] account_analytic_analysis : Removed all filters
 related to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522052455-6vzp6p1dezgild73
---
 .../account_analytic_analysis_menu.xml                       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 54c8323d996..248a342506b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -26,10 +26,6 @@
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-                        <filter icon="terp-go-month"
-                             string=" +1 Month"
-                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Analytic Accounts with a past deadline in one month." />
 
                         <separator orientation="vertical"/>
                         <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
@@ -39,6 +35,7 @@
                         <field name="user_id">
                             <filter string="Contracts not assigned to an account manager" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         </field>
+                        <field name="date"/>
 
                     </group>
                     <newline/>

From c9a31168dfab779975f186967b26c9481d3dee78 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:04:08 +0530
Subject: [PATCH 016/161] [IMP] account_asset : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522053408-d7vvu14w3fsbnxlv
---
 .../report/account_asset_report_view.xml              | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index c2f931862f5..3ef8cf3a58f 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,17 +44,6 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="Year" icon="terp-go-year" name="year"
-                        domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Assets purchased in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                        domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in current month"/>
-                    <filter icon="terp-go-month" string="Month-1" separator="1"
-                        domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                     <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
                     <separator orientation="vertical"/>

From 970a4ef2e8c21bc40da0b1e726dba8a3598c4265 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:18:29 +0530
Subject: [PATCH 017/161] [IMP] account_voucher : Removed all filters related
 to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522054829-dwfg64agv8veh73s
---
 .../report/account_voucher_sales_receipt_view.xml  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 561dcf747d4..726f331164c 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,19 +49,6 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -85,6 +72,7 @@
                     <field name="account_id"/>
                     <separator orientation="vertical"/>
                     <field name="date_due"/>
+                    <field name="date"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>

From 67d5ab5ae0e2c8a1513f2da00e7179b9b03c32dd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:40:02 +0530
Subject: [PATCH 018/161] [IMP] crm : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522061002-ux5oppi3a52srv1e
---
 addons/crm/crm_lead_view.xml                  |  9 +---
 addons/crm/crm_phonecall_view.xml             | 27 +-----------
 addons/crm/crm_report_view.xml                | 43 +++++--------------
 addons/crm/report/crm_lead_report_view.xml    | 11 -----
 .../crm/report/crm_phonecall_report_view.xml  | 11 -----
 5 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9f86b4b16dd..e7dad4679b6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -337,14 +337,6 @@
                     name="pending"
                     domain="[('state','=','pending')]"/>
 
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Leads" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Leads creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
                 <separator orientation="vertical"/>
                 <field name="name" string="Lead / Customer"
                     filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
@@ -372,6 +364,7 @@
                 <field name="country_id" context="{'invisible_country': False}">
                     <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
+                </field name="create_date"/>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ec03b9d11ea..611ab3ce1f3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -188,19 +188,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
@@ -215,6 +202,7 @@
                        icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
+               <field name="date"/>
                </field>
                <newline/>
                <group expand="0" string="Group By...">
@@ -239,18 +227,6 @@
         <field name="arch" type="xml">
             <search string="Scheduled Phonecalls">
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
 
                <separator orientation="vertical"/>
                <field name="name"/>
@@ -267,6 +243,7 @@
                        icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
+               <field name="date"/>
                </field>
                <newline/>
                <group expand="0" string="Group By...">
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 74443b135aa..aaad73af29a 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,17 +69,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Type for this month" />
-                           <separator orientation="vertical"/>
-                           <field name="section_id"
-                               widget="selection" />
-                           <field name="category2_id"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="section_id" widget="selection" />
+                        <field name="category2_id"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
@@ -163,13 +157,8 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by Team and Stage for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by Team and Stage for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -239,13 +228,8 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                     <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by Section, Category and Stage for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by Section, Category and Stage for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -332,13 +316,8 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                     <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by User for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by User for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 3d91e65e540..47784dbf76b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -72,17 +72,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
                             name="lead"
                             string="Lead"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index bd4453d6a02..f3d39c08efe 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -52,17 +52,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Phone calls made in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Phone calls made in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"

From be72e6bc57b639c262cdd5e79b673c279c1867fb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:49:41 +0530
Subject: [PATCH 019/161] [IMP] crm_claim : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522061941-6waf82biqv2hm4zq
---
 addons/crm_claim/report/crm_claim_report_view.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 411963dbb63..ff54f598819 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -54,20 +54,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                       <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Claims created in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Claims created in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in last month"/>
-
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -118,6 +104,7 @@
                         <field name="priority" />
                         <field name="type_action" />
                         <newline/>
+                        <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
                     </group>

From 15c23819e40c2bf5199cc9e2413e56302fd025c0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:58:47 +0530
Subject: [PATCH 020/161] [IMP] crm_fundraising : Removed all filters related
 to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522062847-scb5jnhtv6xdoji6
---
 .../report/crm_fundraising_report_view.xml         | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 583dfd1e9d5..fafbe6c9b55 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -76,19 +76,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Funds raised in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Funds raised in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -128,6 +115,7 @@
                             domain="[('state','=','cancel')]"/>
                         <separator orientation="vertical"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="create_date"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">

From dcad4713ae722733cd8a970283f3f203d155d13d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:05:31 +0530
Subject: [PATCH 021/161] [IMP] crm_helpdesk : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522063531-re45k20jiwn2q3s0
---
 addons/crm_helpdesk/crm_helpdesk_view.xml           | 11 +----------
 .../report/crm_helpdesk_report_view.xml             | 13 +------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 2e204f9a229..770b0087eed 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -217,16 +217,6 @@
                         help="All pending Helpdesk Request"
                     />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','&gt;=',current_date), ('date','&lt;=',current_date)]"
-                        help="Todays's Helpdesk Requests"
-                        />
-                    <filter icon="terp-go-week"
-                        string="7 Days"
-                        help="Helpdesk requests during last 7 days"
-                        domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                    <separator orientation="vertical"/>
                     <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
@@ -236,6 +226,7 @@
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
                     </field>
+                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 34f07c35ebf..20f0dc2646d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -54,18 +54,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests occurred in current year"/>
-                        <separator orientation="vertical" />
-
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in last month"/>
-                        <separator orientation="vertical" />
                         <filter string="New" icon="terp-check"
                         domain="[('state','=','draft')]" />
                         <filter string="Open" icon="terp-camera_test"
@@ -97,6 +85,7 @@
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
                         <newline/>
+                        <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
                     <newline/>

From 8d5296adfaa79546259ae1e8e6f74b6a81c510da Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:10:27 +0530
Subject: [PATCH 022/161] [IMP] crm_partner_assign : Removed all filters
 related to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522064027-pditpokigbv9dc53
---
 addons/crm_partner_assign/report/crm_lead_report_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 256719c8742..9dbfdf998c0 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -10,11 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>

From 8944ae0da8dfe3098124ed5e89e3f227574f5bae Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:14:17 +0530
Subject: [PATCH 023/161] [IMP] document : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522064417-pljax1jh0v6nlc42
---
 addons/document/report/document_report_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 0333e8aca15..4541d0189e4 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -43,9 +43,6 @@
                 <search string="All users files">
                     <group>
                         <separator orientation="vertical"/>
-                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-                            <separator orientation="vertical"/>
                             <field name="name"/>
                             <field name="month"/>
                             <field name="user"/>

From cf2a6ceb95c48b6670ca8df0845f3194e5e39a54 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:18:28 +0530
Subject: [PATCH 024/161] [IMP] event : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522064828-7aic79o4w50h77xu
---
 .../event/report/report_event_registration_view.xml   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 71d656740fe..89ba191dab6 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,17 +53,6 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter string="Year" icon="terp-go-year" name="year"
-                          domain="[('event_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('event_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                          help="Events happening this year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                          domain="[('event_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happening in current month"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                          domain="[('event_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happened in last month"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="New"
                         domain="[('event_state','=','draft')]"

From 27cc0e0b287b9151648d21e1fe7ae82310f568f1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:29:54 +0530
Subject: [PATCH 025/161] [IMP] hr_evaluation : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522065954-1xhbje34p0j5xqsn
---
 addons/hr_evaluation/hr_evaluation_view.xml          |  4 +---
 .../report/hr_evaluation_report_view.xml             | 12 +-----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e38a8796895..a3c1b183221 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -254,14 +254,12 @@
                     <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
-                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
                     <field name="plan_id" widget="selection" />
+                    <field name="date"/>
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b82c8f6f850..965366723c7 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -47,17 +47,6 @@
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
             	<group>
-            		<filter icon="terp-go-year" string="Year"
-                        name="year"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <separator orientation="vertical"/>						
-                    <filter icon="terp-go-month" string=" Month " name="month" 
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " 
-                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Evaluation done in last month"/>
-                    <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
@@ -74,6 +63,7 @@
                     <field name="deadline"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
+                    <field name="create_date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">

From 94c010b8a13ff19e851681455e8fee4138700880 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:33:48 +0530
Subject: [PATCH 026/161] [IMP] hr_expense : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522070348-mollhizuy7zbgd5q
---
 addons/hr_expense/hr_expense_view.xml               |  3 ---
 addons/hr_expense/report/hr_expense_report_view.xml | 12 ------------
 2 files changed, 15 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e54e38e429a..375e3ec2ef0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -142,9 +142,6 @@
                       <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                      <separator orientation="vertical"/>
                       <field name="employee_id"/>
                       <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 32f4ab32b65..c09cb847385 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,18 +53,6 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="Year" name="year"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                      help="Expenses during current year"/>
-                    <separator orientation="vertical"/>					  
-                  <filter icon="terp-go-month" string="Month"
-                      name="month"
-                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " 
-                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                  <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"

From a6309fd120130688fc4f024de1f5f78cb9cc5f8e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:38:24 +0530
Subject: [PATCH 027/161] [IMP] hr_holidays : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522070824-rzi5go9rxcoq0u73
---
 addons/hr_holidays/hr_holidays_view.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a311ca971f7..9ec209db80e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,16 +8,6 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
-                        <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
-                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Holidays during last month"/>
-                        <separator orientation="vertical"/>
                         <field name="employee_id">
                             <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                         </field>
@@ -25,6 +15,7 @@
                             <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
+                        <field name="date_from"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 44762771e087988fa7ea816afa1869d507e8aae4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:47:34 +0530
Subject: [PATCH 028/161] [IMP] hr_recruitment : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522071734-hqzc9elgoxyve13t
---
 .../report/hr_recruitment_report_view.xml           | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 112258ac4af..75f663ffa8e 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,19 +49,6 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Recruitment performed in current year"/>
-                    <separator orientation="vertical"/>	
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment performed in current month"/>
-                    <filter icon="terp-go-month"
-                        string="    Month-1    "
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment during last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="New"
                         icon="terp-document-new"
                         domain="[('state','=','draft')]"

From 1853da8952ce99b8c42349c9200fb0af16edae5f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:50:26 +0530
Subject: [PATCH 029/161] [IMP] hr_timesheet : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522072026-bq40iydnu2hb44ke
---
 addons/hr_timesheet/hr_timesheet_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e4838edbd3e..8df6c78d767 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -63,8 +63,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
-                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="account_id"/>
                         <field name="date"/>

From a4d963311864f4e0f22b57ecfaeaa2b613632784 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:54:16 +0530
Subject: [PATCH 030/161] [IMP] hr_timesheet_invoice : Removed all filters
 related to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522072416-00ijo6jf6k0al61p
---
 .../hr_timesheet_invoice_report_view.xml      | 24 -------------------
 .../report/report_analytic_view.xml           |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index be090dfcdbb..07cffe9ea2c 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,18 +47,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <filter icon="terp-go-year" string="This Year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet lines in this year"/>
-                      <filter icon="terp-go-month" string="This Month"
-                          name="month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Timesheet lines in this month"/>
-                    <filter icon="terp-go-week"
-                              string="    7 Days    "
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                              help="Timesheet lines during last 7 days"/>
-                      <separator orientation="vertical"/>
                       <field name="user_id" widget="selection">
                           <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
@@ -162,10 +150,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="user_id"/>
@@ -298,10 +282,6 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -370,10 +350,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c196beae880..c32ae7a076b 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,9 +114,6 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="product_id"/>

From c249a5fe311f565766a813d6f0cdfe6c083049f6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:58:37 +0530
Subject: [PATCH 031/161] [IMP] hr_timesheet_sheet : Removed all filters
 related to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522072837-kfzhzjliex4nmlkt
---
 .../report/hr_timesheet_report_view.xml           | 14 --------------
 .../report/timesheet_report_view.xml              | 15 +--------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 447c3be6966..752850d31d6 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -41,20 +41,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>							
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
                             <field name="account_id" groups="analytic.group_analytic_accounting"/>
                             <field name="user_id"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 96277f10c78..7bbd2175c92 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -49,20 +49,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>								
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                                 string="Draft"
                                 domain="[('state','=','draft')]"/>
@@ -87,6 +73,7 @@
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <newline/>
+                        <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>

From 63964f4df46cff25c78c9fbfc102dd62b0e6963c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 14:23:01 +0530
Subject: [PATCH 032/161] [IMP] idea : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522085301-h5j8t4zbnusp6yci
---
 addons/idea/report/report_vote_view.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index f3b722a4ce5..4437337f7f9 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -29,18 +29,6 @@
             <field name="arch" type="xml">
                 <search string="Idea Vote Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Idea Vote created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month" name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Idea Vote created in current month"/>
-                        <filter icon="terp-go-month"
-                             string="Month-1"
-                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="Idea Vote created last month"/>
-                         <separator orientation="vertical"/>
                         <filter icon="terp-camera_test"
                             string="In Progress"
                             domain="[('idea_state','=',('open'))]"/>
@@ -54,6 +42,7 @@
                         <field name="idea_id" string="Idea"/>
                         <field name="creater_id" string="Creator"/>
                         <field name="user_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">

From 4bf7b26451119f6442b139435b6e08fe7748549a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 14:34:03 +0530
Subject: [PATCH 033/161] [IMP] lunch : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522090403-sc6kckhn434g732y
---
 addons/lunch/lunch_view.xml                   | 19 +------------------
 .../lunch/report/report_lunch_order_view.xml  | 12 +-----------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7070b995dc6..a92a51e967b 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -82,8 +82,6 @@
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                     <field name="date"/>
                     <newline/>
@@ -189,8 +187,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
@@ -372,23 +368,10 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  " name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Box amount in current year"/>
-                    <separator orientation="vertical"/>
-
-                        <filter icon="terp-go-month" string="   Month   "
-                                name="month"
-                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Box amount in current month"/>
-                        <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Box amount in last month"/>
-                    <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 5dd25322d47..168398ae5cc 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -26,17 +26,7 @@
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="    7 Days    "
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Tasks during last 7 days"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">

From 99cd6418ec4cea134fff16ff153eed9cc8b92c53 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 14:47:02 +0530
Subject: [PATCH 034/161] [IMP] crm : fix the error.

bzr revid: mdi@tinyerp.com-20120522091702-fz3ajgpngcyp8qmu
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e7dad4679b6..a48949b1c74 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -364,7 +364,7 @@
                 <field name="country_id" context="{'invisible_country': False}">
                     <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
-                </field name="create_date"/>
+                <field name="create_date"/>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

From d991d8c766b7bfdff1fe80e7dae85afc43201a20 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 15:14:35 +0530
Subject: [PATCH 035/161] [IMP] mail : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522094435-13gj3o0w2imbkxcm
---
 addons/mail/report/mail_message_report_view.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml
index ecb26b78d1d..9874214b32a 100644
--- a/addons/mail/report/mail_message_report_view.xml
+++ b/addons/mail/report/mail_message_report_view.xml
@@ -18,17 +18,7 @@
             <field name="arch" type="xml">
                 <search string="Mail message Analysis">
                     <group>
-                    <filter icon="terp-go-year" string="  Year  "
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Messages created in current year"/>
-                    <filter icon="terp-go-month" string="   Month   "
-                        name="month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Messages created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Messages created in last month"/>
+                        <field name="create_date"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">

From 31a851ad15675161a5823bcc50fb6d2b3081bd32 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 15:34:16 +0530
Subject: [PATCH 036/161] [IMP] marketing_campaign : Removed all filters
 related to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522100416-vxto8fumhcnil9hz
---
 .../marketing_campaign_view.xml                  |  2 --
 .../report/campaign_analysis_view.xml            | 16 +---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index d04cde0e428..379992d1b29 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -398,8 +398,6 @@
        <field name="arch" type="xml">
            <search string="Marketing Campaign Activities">
                <group>
-                <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
                 <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <separator orientation="vertical"/>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index ea1ddc9a397..9d978d260e4 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -32,21 +32,6 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                    <group>
-                    <filter icon="terp-go-year" name="year"
-                            string="Year"
-                            domain="[('year','=',time.strftime('%%Y'))]"/>
-                    <separator orientation="vertical"/>
-
-                    <filter icon="terp-go-month"
-                            string="Month" name="This Month"
-                            domain="[('month','=',time.strftime('%%m'))]"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-
-                    <filter icon="terp-go-today"
-                            string="Today"
-                            domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
                             domain="[('state','=','todo')]"/>
@@ -62,6 +47,7 @@
                     <field name="segment_id"/>
                     <field name="partner_id"/>
                     <field name="country_id"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">

From 601802a62f2be8a172e80a6b1f2aa8051a7344a1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 15:38:36 +0530
Subject: [PATCH 037/161] [IMP] membership : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522100836-rnmbhv0jx93vev0d
---
 addons/membership/report/report_membership_view.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index b0ac01ac89f..259a3935fa7 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,23 +36,13 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Events created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    "
-                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in last month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
                         <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
+                        <field name="date_from"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">

From 3f148674c2e57ae71e66679360b968da0e1f6692 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 15:46:07 +0530
Subject: [PATCH 038/161] [IMP] mrp_operations : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522101607-8hsiqjagdvepocnk
---
 .../report/mrp_workorder_analysis_view.xml        | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 45b6ffd9be9..455c2ca27f7 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,26 +47,13 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('year','=',time.strftime('%%Y'))]"
-                                help="Work orders made during current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('month','=',time.strftime('%%m'))]"
-                                help="Work orders made during current month"/>
-                        <filter icon="terp-go-week"
-                                string="Month -1"
-                                domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
-                                help="Work orders during last month"/>
-                      <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
                       <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
+                        <field name="date"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">

From ce6d03c66a25f412a28a7265f4cbb177cb84f759 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 12:12:41 +0530
Subject: [PATCH 039/161] [IMP] point_of_sale : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120528064241-imvko29lik159xal
---
 .../report/pos_order_report_view.xml          | 19 +------------
 .../report/report_cash_register_view.xml      | 28 ++++---------------
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index a1631ab0203..b3a9990023c 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,24 +35,6 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month" name="This Month"
-                           domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="POS ordered created during current month"/>
-                        <filter icon="terp-go-month"
-                             string="Month -1"
-                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
@@ -67,6 +49,7 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                     </field>
+                    <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index b4a2f1e6ecb..cfed1aebdc7 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -26,29 +26,10 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Point of Sale Cash Register Analysis">
-                  <group>
-                      <filter icon="terp-go-year" string="Year" name="year"
-                          domain="[('year','=',time.strftime('%%Y'))]"
-                          help="Cash Analysis created during this year"/>
-                      <separator orientation="vertical"/>
-
-                      <filter icon="terp-go-month" string="Month" name="This Month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Cash Analysis created in current month"/>
-                      <filter icon="terp-go-month"
-                           string="Month -1"
-                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Cash Analysis created in last month"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>
-                      <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                            string="Draft"
-                            domain="[('state','=',('draft'))]"/>
+                <group>
+                    <filter icon="terp-document-new"
+                        string="Draft"
+                        domain="[('state','=',('draft'))]"/>
                       <filter icon="terp-camera_test"
                           string="Confirm"
                           domain="[('state','=',('confirm'))]"/>
@@ -59,6 +40,7 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                         </field>
+                        <field name="date">
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">

From 6a47ac151c712ae09d9e1f86a3e931411c12cf7d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 12:42:22 +0530
Subject: [PATCH 040/161] [IMP] project : Added missing filter string and
 removed all filters related to a date field and added the related date field
 in the search view.

bzr revid: mdi@tinyerp.com-20120528071222-0kupd9u5nqxe2rnl
---
 addons/project/project_view.xml               |  2 +-
 addons/project/report/project_cumulative.xml  | 14 ++++----------
 addons/project/report/project_report_view.xml | 14 --------------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 70cdac1efa0..bfa9f4c90bf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -124,7 +124,7 @@
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager">
-                            <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                            <filter string="Projects in which I am a manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                        </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 89667992f0a..2e5ecd28f88 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -58,20 +58,14 @@
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-1" name="month1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-2" name="month2"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=2)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=2)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
                         <field name="project_id">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                             <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                            <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         </field>
+                        <field name="date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 3bdec47fcb9..446b808c57b 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -62,20 +62,6 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-                                help="Current Year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Current Month"/>
-                        <filter icon="terp-go-week"
-                                string="Month-1"
-                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Previous Month"/>
-                        <separator orientation="vertical"/>
                         <filter string="New"
                                 icon="terp-document-new"
                                 domain="[('state','=','draft')]"

From 0c2acefc6c66edbb4708a77b890c156b7c6b6b72 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 12:49:18 +0530
Subject: [PATCH 041/161] [IMP] point_of_sale : fix the eeror.

bzr revid: mdi@tinyerp.com-20120528071918-sdthomsohyev6lrt
---
 addons/point_of_sale/report/report_cash_register_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index cfed1aebdc7..3cbc315ce0f 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -40,7 +40,7 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="date">
+                        <field name="date"/>
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">

From aa495b790e090ca137a7fdc1403ca0836e79e493 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 15:03:41 +0530
Subject: [PATCH 042/161] [IMP] point_of_sale : Removed all filters related to
 a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120528093341-x7dvpnknwez9w1bs
---
 addons/point_of_sale/point_of_sale_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index a83aab01ca9..ebdc5ccb352 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -143,11 +143,9 @@
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>
+                    <field name="date_order"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>

From d9bd1faea593fff34435b53e85b0c11a9772d443 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 15:17:52 +0530
Subject: [PATCH 043/161] [IMP] project_issue : Added missing filter string and
 removed all filters related to a date field and added the related date field
 in the search view.

bzr revid: mdi@tinyerp.com-20120528094752-sy2vtk9dcsep1rd5
---
 addons/project_issue/project_issue_view.xml         |  2 +-
 .../report/project_issue_report_view.xml            | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 716a02f2f60..079cfc4f7f9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -170,7 +170,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
                         <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                            <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                         </field>
                         <field name="project_id"/>
                         <field name="id"/>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index ee0a4fbd1ed..3f35b780534 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -53,18 +53,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" help="Current Year"
-                        name="year"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />
-                        <separator orientation="vertical" />
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                        <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -84,6 +72,7 @@
                           <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
+                          <field name="create_date"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">

From ddbe1c6a58de63ac8ecd2a9152b8ecfa24983096 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 28 May 2012 15:18:49 +0530
Subject: [PATCH 044/161] [IMP]crm: added a country field in group by filter in
 opportunity and customer serch view

bzr revid: mma@tinyerp.com-20120528094849-prjozx2chaezmafy
---
 addons/crm/crm_lead_view.xml    | 1 +
 addons/crm/res_partner_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c2b8f48eb6..08c675ca274 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -615,6 +615,7 @@
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Country" help="Country" icon="terp-go-home" domain="[]" context="{'group_by':'country_id'}"/>
                     <separator orientation="vertical" />
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index fe880d29bd3..1eac3c17ec3 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,6 +39,9 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
+                    <xpath expr="//filter[@string='Company']" position="after">
+                        <filter string="Country" icon="terp-go-home" help="Country" domain="[]" context="{'group_by':'country_id'}"/>
+                    </xpath>
                 </field>
         </record>
 

From c958ecce52827e8bf91215c939d88559033199fd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 15:24:46 +0530
Subject: [PATCH 045/161] [IMP] project_long_term : added missing filter string
 in search view.

bzr revid: mdi@tinyerp.com-20120528095446-vjcjr4xq6qc3ltmq
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1e9f50cdd87..ad3a6c9b9e0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -272,7 +272,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                            <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         </field>
                         <field name="date_start"/>
                         <field name="date_end"/>

From 2fc05037fdee7995e6e458b80765d408ff437ff4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 15:49:52 +0530
Subject: [PATCH 046/161] [IMP] project_scrum : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120528101952-tn5c975hp1k6cwk9
---
 addons/project_scrum/project_scrum_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index ef8a2681620..354ce1daaef 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -149,11 +149,11 @@
                         <field name="project_id"/>
                         <field name="sprint_id" domain="[('state','in',('draft','open'))]">
                             <filter icon="terp-check"
-                                string="Sprints"
+                                string="Backlogs Assigned To Current Sprints"
                                 domain="[('sprint_id.state','=','open')]"
                                 help="Backlogs Assigned To Current Sprints"/>
                             <filter icon="terp-personal-"
-                                string="Sprints"
+                                string="Backlogs Not Assigned To Sprints"
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
@@ -440,7 +440,7 @@
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id">
-                            <filter icon="terp-check" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                            <filter string="Current Sprints" icon="terp-check" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
                         <field name="date"/>
                     </group>
@@ -580,8 +580,8 @@
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
-                        <filter icon="terp-check" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
-                        <filter icon="gtk-find" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
+                        <filter string="Current Sprints" icon="terp-check" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                        <filter string="View Sprints" icon="gtk-find" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
                     </field>
                 </field>
             </field>

From 7eef578e9302ecda5771466abc44548bd7c7ce65 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 28 May 2012 18:56:19 +0530
Subject: [PATCH 047/161] [IMP]: removed name in filter

bzr revid: mma@tinyerp.com-20120528132619-o3coy4kaneqczxcj
---
 addons/crm/crm_lead_view.xml                  | 3 ---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 addons/project_issue/project_issue_view.xml   | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 08c675ca274..0090ac8c3af 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -580,15 +580,12 @@
             <search string="Search Opportunities">
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
-                    name="new"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-camera_test"
                     string="Open"  help="Open Opportunities"
-                    name="open"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
                     string="Pending"  help="Pending Opportunities"
-                    name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity / Customer"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5c8b560b380..c3961c3330f 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -172,11 +172,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-document-new" string="New" name="filter_new" 
+               <filter icon="terp-document-new" string="New" 
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
                />
-               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
+               <filter icon="terp-camera_test" string="In Progress" 
                    domain="[('state','=','open')]"
                    help="Open Jobs"
                />
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 716a02f2f60..148d2f79b97 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -164,8 +164,8 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>

From e8bf2fda8ed49ba8a4982a276df1d764debfd2fd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 10:25:09 +0530
Subject: [PATCH 048/161] [IMP] project_timesheet : Removed all filters related
 to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120529045509-garnh9vhb68fph0v
---
 .../project_timesheet/report/task_report_view.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index b1ba9b8672e..6d430347c01 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -31,21 +31,8 @@
             <field name="arch" type="xml">
             	<search string="Tasks by User">
             		<group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Task Hours in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task Hours in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>
-	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
+	                    <field name="name"/>
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By...">

From 1ec901aa813300c587a5e061f3cae909d689f573 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 10:40:45 +0530
Subject: [PATCH 049/161] [IMP] purchase : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120529051045-d8er0czvss2lw2ti
---
 addons/purchase/report/purchase_report_view.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2837b5e7ab6..10672be504a 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -54,20 +54,6 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group>
-                <filter icon="terp-go-year" string="Year"
-                name="year"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                help="Order in current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Order in  current month"/>
-                <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Order in last month"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
                         string="Quotations"
                         name="quotes"

From 612ff6bfda23f0f6b1c44c061303e43ac94485bf Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 14:20:51 +0530
Subject: [PATCH 050/161] [IMP] report_intrastat : Removed all filters related
 to a date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120529085051-3cj6wyz22v0q9zao
---
 addons/report_intrastat/report_intrastat_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 2527f2e4f97..295fcbeeb4b 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -98,9 +98,6 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="code"/>

From cef8622452535e0d63e82ccffbe4ff6877a51b7c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 14:35:37 +0530
Subject: [PATCH 051/161] [IMP] sale : Added missing filter string and removed
 all filters related to a date field and added the related date field in the
 search view.

bzr revid: mdi@tinyerp.com-20120529090537-9c0slyugyzlof7y1
---
 addons/sale/report/sale_report_view.xml | 13 -------------
 addons/sale/sale_view.xml               |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4b3647a5ac2..9cb332d69e2 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,19 +51,6 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Sales order created in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Sales order created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Sales order created in last month"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
                         domain="[('state','=','draft')]"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 36c061645e7..a8206aea906 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -290,7 +290,7 @@
                         filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
                     <field name="user_id">
-                        <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
+                        <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -444,7 +444,7 @@
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
+                        <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -473,7 +473,7 @@
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
+                        <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">

From 4077d10f71097326435c477704edda2307ba3746 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 14:39:26 +0530
Subject: [PATCH 052/161] [IMP] sale_crm : added missing filter string in
 search view.

bzr revid: mdi@tinyerp.com-20120529090926-vbuaebnci8qoltc1
---
 addons/sale_crm/sale_crm_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 3151c910e2f..9056adc4289 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -37,7 +37,8 @@
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
                     <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)"/>
                     </field>

From bcf2099bac094485929d48e1ef3cfd43656dfd47 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 30 May 2012 10:37:27 +0530
Subject: [PATCH 053/161] [IMP] stock : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120530050727-2nk2v9nvegwnc1il
---
 .../stock/report/report_stock_move_view.xml   | 30 -------------------
 addons/stock/stock_view.xml                   |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index dc457bc4ea8..d6ab3c4674f 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -67,21 +67,6 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="Year"
-                    name="year"
-                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                    help="Current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                    name="month"
-                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                    help="Current month"/>
-                <filter icon="terp-go-month"
-                    string="Month-1"
-                    name="month-1"
-                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                     help="Last month"/>
-                <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
                     icon="terp-dialog-close"
@@ -190,21 +175,6 @@
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
-                        name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current month"/>
-                    <filter icon="terp-go-month"
-                        string="Month-1"
-                        name="month-1"
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cff0298d08b..e8bbd306aa7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1485,7 +1485,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>

From 22c4f2916d8009ac4921aef1a546d6b37d6979f8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 30 May 2012 10:45:14 +0530
Subject: [PATCH 054/161] [IMP] subscription : Removed all filters related to a
 date field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120530051514-p8kq32722m38wqnr
---
 addons/subscription/subscription_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 13ebe096843..c00c4e8b40f 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -84,14 +84,11 @@
                         <filter icon="terp-check"
                         string="Running"
                         domain="[('state','=','running')]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-today" string="Today"
-                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="user_id"/>
                         <field name="partner_id"/>
+                        <field name="date_init"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From c6bb1edac40d538c60548ad03c6f0cc1ecdb09d0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 30 May 2012 10:51:32 +0530
Subject: [PATCH 055/161] [IMP] survey : added missing filter string in search
 view.

bzr revid: mdi@tinyerp.com-20120530052132-jpb0r9nrjik4mt8n
---
 addons/survey/survey_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e8f02f6d3e0..a5560c8208d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -267,7 +267,7 @@
                         <field name="title"/>
                         <field name="type" widget="selection"/>
                         <field name="responsible_id">
-                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
+                            <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
                    <newline/>
@@ -1110,7 +1110,7 @@
                         <field name="survey_id" widget="selection"/>
                         <field name="email"/>
                         <field name="user_id">
-                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                     </group>
                     <newline/>

From 395d912bb87dee3de4461fb361215f5c54e609f8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 1 Jun 2012 18:38:18 +0530
Subject: [PATCH 056/161] [IMP] account :Improved filter string in search view.

bzr revid: mdi@tinyerp.com-20120601130818-tmkerk2yvfdmklpl
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 90ac278d0fc..e757dc17d11 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1254,7 +1254,7 @@
                         <field name="date"/>
                         <field name="account_id"/>
                         <field name="partner_id">
-                            <filter string="Next Partner Entries to reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter string="Next Partner Entries" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>

From 4b8468d84f917182b0c1adb624034ac3494653ca Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 1 Jun 2012 18:41:48 +0530
Subject: [PATCH 057/161] [IMP] account_analytic_analysis :Improved filter
 string in search view.

bzr revid: mdi@tinyerp.com-20120601131148-bxrbqobb5d626i3x
---
 .../account_analytic_analysis_menu.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 31f211264a0..5e8bc754d45 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -30,10 +30,10 @@
                         <separator orientation="vertical"/>
                         <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                         <field name="partner_id">
-                            <filter string="Partner set on analytic account" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                            <filter string="Partner on analytic account" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                         </field>
                         <field name="user_id">
-                            <filter string="Contracts not assigned to an account manager" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                            <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         </field>
                         <field name="date"/>
 

From 21fa3c5e314d2ddf655a4fc2c096d4462f6c6d6d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 1 Jun 2012 18:46:53 +0530
Subject: [PATCH 058/161] [IMP] project :Improved filter string in search view.

bzr revid: mdi@tinyerp.com-20120601131653-6rba78oh5kvlyv44
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c63548651af..1158d211371 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -124,7 +124,7 @@
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager">
-                            <filter string="Projects in which I am a manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                            <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                        </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
@@ -344,7 +344,7 @@
                                     name="planned_hours"
                                     widget="float_time"
                                     attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"									
+                                    groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field
                                     name="effective_hours"

From 0208d57dcd35369820824a17ebd56bfd45d25a7d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 1 Jun 2012 18:49:10 +0530
Subject: [PATCH 059/161] [IMP] project_scrum :Improved filter string in search
 view.

bzr revid: mdi@tinyerp.com-20120601131910-p74g5w7tkqz3y6j6
---
 addons/project_scrum/project_scrum_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index e81c3a97641..438e4604905 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -145,11 +145,11 @@
                         <field name="project_id"/>
                         <field name="sprint_id" domain="[('state','in',('draft','open'))]">
                             <filter icon="terp-check"
-                                string="Backlogs Assigned To Current Sprints"
+                                string="Backlogs Assigned"
                                 domain="[('sprint_id.state','=','open')]"
                                 help="Backlogs Assigned To Current Sprints"/>
                             <filter icon="terp-personal-"
-                                string="Backlogs Not Assigned To Sprints"
+                                string="Backlogs Not Assigned"
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>

From 709522a45b1b85701b25bd3d0567ab214133fd90 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 11:57:09 +0530
Subject: [PATCH 060/161] [IMP] account : fix the error : Object 2012-01-01 has
 no method 'getFullYear'.

bzr revid: mdi@tinyerp.com-20120604062709-qi1qj4thrvq75q3d
---
 addons/account/report/account_invoice_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c156c980301..b5d3881a966 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -124,7 +124,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 

From 5097feeaf2c3a899e13b32e91d3f9c919df08c38 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 12:07:42 +0530
Subject: [PATCH 061/161] [IMP] account_voucher : fix the error : Object
 2012-01-01 has no method 'getFullYear'.

bzr revid: mdi@tinyerp.com-20120604063742-6ajtzzvily37jz2i
---
 .../report/account_voucher_sales_receipt_view.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index b452af6776a..aeea50a0b1a 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -103,7 +103,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_sale_receipt_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 

From 8459c8af3c01592c181d0fed4906edf5fff8b764 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 14:34:37 +0530
Subject: [PATCH 062/161] [IMP] project_issue : fix the view error.

bzr revid: mdi@tinyerp.com-20120604090437-ynq8w2a7w1y0c9mh
---
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 41eea15bb42..5d7f9c7c671 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -72,7 +72,7 @@
                           <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
-                          <field name="create_date"/>
+                          <field name="creation_date"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">

From a08bdbdc144e4ca414d72e9e1256bc4125415b2f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 14:53:57 +0530
Subject: [PATCH 063/161] [IMP] account : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120604092357-9xpbn946nvjemmoo
---
 .../account_analytic_entries_report_view.xml  | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 3dce53d8685..18bda6cbbab 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,36 +35,13 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                            name="month"
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 30 days"/>
-                    <filter icon="terp-go-week"
-                            string="    7 Days    "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries during last 7 days"/>
-                    <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id">
                     <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     </field>
+                    <field name="date"/>
+                    <field name="day"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">

From c9260da9cd1adcd173d4d210b4faf78743a2e43b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 15:30:04 +0530
Subject: [PATCH 064/161] [IMP] account_asset : fix the error : Object
 2012-01-01 has no method 'getFullYear'.

bzr revid: mdi@tinyerp.com-20120604100004-flnvca2ezn51q6k6
---
 addons/account_asset/report/account_asset_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index 3ef8cf3a58f..cb529ae660d 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -83,7 +83,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs;</field>
     </record>
     

From 023c314f198a9584eedbbfa459520ce143d18225 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 10:42:55 +0530
Subject: [PATCH 065/161] [IMP] Improved some typos in filter string.

bzr revid: mdi@tinyerp.com-20120606051255-62wyp3k4kmfkr9o2
---
 addons/account/account_invoice_view.xml                       | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml             | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 2 +-
 addons/mrp_repair/mrp_repair_view.xml                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d1b6e21d61a..d822b3dda85 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -370,7 +370,7 @@
                             filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
+                            <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
                         </field>
                     </group>
                     <newline/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 4c0b8a6c1cd..eefc534fc0e 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -76,7 +76,7 @@
 
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter string="My company"
+                            <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 6c94f18c8f8..7de3509ef24 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -95,7 +95,7 @@
                                 help="My Sales Team(s)" />
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter string="My company"
+                            <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9ced148629e..f1d111747f0 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -70,7 +70,7 @@
                             help="My Sales Team(s)" />
                         </field>
                         <field name="company_id" groups="base.group_multi_company">
-                            <filter string="My company"
+                            <filter string="My Company"
                             icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 21e3dd5aa25..3802aa08db6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -189,7 +189,7 @@
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
+                       <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="product_id"/>

From cf0d077767e3f2a4f01cb2675170e185bb1f361c Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 6 Jun 2012 18:43:25 +0530
Subject: [PATCH 066/161] [IMP] crm: typo

bzr revid: psi@tinyerp.com-20120606131325-5yszqjo2l56bwq1p
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5fc7858dee8..6d69209f5d8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -329,7 +329,7 @@
                 </field>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
-                    <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
                 </field>
                 <field name="create_date"/>
                 <newline/>

From 3692c1dd1491431019eb72f8fc1686f008864069 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 11 Jun 2012 14:12:57 +0200
Subject: [PATCH 067/161] [IMP] account: improved search view on journal items
 + removed views for an object that does not exist anymore

bzr revid: qdp-launchpad@openerp.com-20120611121257-91c8sybl0x2ykot0
---
 addons/account/account_view.xml         |  3 +-
 addons/account/project/project_view.xml | 64 -------------------------
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e7a1fa40c93..5a36204cddf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1238,11 +1238,12 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
+                        <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                        <separator orientation="vertical"/>
                         <field name="move_id" string="Number (Move)"/>
                         <field name="date"/>
                         <field name="account_id"/>
                         <field name="partner_id">
-                            <filter string="Next Partner Entries" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index aa92167f64d..0abbe54bc16 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -377,70 +377,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-        #
-        # Statistics
-        #
-
-        <record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.form</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Entries Stats">
-                    <field name="name" select="1"/>
-                    <field name="account_id" select="1"/>
-                    <field name="journal_id" select="2"/>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.tree</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Entries Stats">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="account_id"/>
-                    <field name="journal_id"/>
-                    <field name="quantity"/>
-                    <field name="revenue"/>
-                    <field name="cost"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.graph</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Entries Stats" type="bar">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="cost" operator="+"/>
-                    <field name="revenue" operator="+"/>
-                    <field group="True" name="journal_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.search</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Analytic Entries Stats">
-                    <group>
-                        <field name="name"/>
-                        <field name="month"/>
-                        <field name="account_id"/>
-                    </group>
-                </search>
-            </field>
-        </record>
 
         <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"

From 93273fe850d723e475aa1a0e8ad47b0d0836ffd5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 11 Jun 2012 18:22:53 +0200
Subject: [PATCH 068/161] [IMP] improved search views

bzr revid: qdp-launchpad@openerp.com-20120611162253-mfz8f7k7dll7q4i9
---
 addons/account/account_invoice_view.xml       |  6 +-
 addons/account/account_view.xml               |  3 +-
 .../account_analytic_entries_report_view.xml  |  5 +-
 .../account_analytic_analysis_menu.xml        | 13 ++---
 addons/caldav/caldav_view.xml                 |  6 +-
 addons/crm/crm_lead_view.xml                  | 44 ++++++++-------
 addons/crm/crm_meeting_view.xml               | 10 ++--
 addons/crm/crm_phonecall_menu.xml             |  2 +-
 addons/crm/crm_phonecall_view.xml             | 56 +++----------------
 addons/crm/report/crm_lead_report_view.xml    | 16 +++---
 .../crm/report/crm_phonecall_report_view.xml  | 15 +++--
 addons/crm_claim/crm_claim_view.xml           | 10 ++--
 .../crm_fundraising/crm_fundraising_view.xml  | 23 ++++----
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 12 ++--
 14 files changed, 87 insertions(+), 134 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 96a0ab609f8..b0f6060698e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -411,13 +411,13 @@
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
+                        <separator orientation="vertical"/>
                         <field name="number"
                             string="Reference"
                             filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
-                        </field>
+                        <field name="user_id" widget="selection" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f99d364951e..a572118b478 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1163,8 +1163,7 @@
                         <field name="move_id" string="Number (Move)"/>
                         <field name="date"/>
                         <field name="account_id"/>
-                        <field name="partner_id">
-                        </field>
+                        <field name="partner_id"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 18bda6cbbab..9759e31ad78 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,11 +35,10 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
-                    <field name="user_id">
-                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    </field>
+                    <field name="user_id"/>
                     <field name="date"/>
                     <field name="day"/>
                 </group>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 5e8bc754d45..a019fd08793 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -26,17 +26,14 @@
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-
+                        <separator orientation="vertical"/>
+                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         <separator orientation="vertical"/>
                         <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <field name="partner_id">
-                            <filter string="Partner on analytic account" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        </field>
-                        <field name="user_id">
-                            <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        </field>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
                         <field name="date"/>
-
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 60d74e69d1e..e4e0679a710 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -162,11 +162,11 @@
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
                     <separator orientation="vertical"/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user_id" widget="selection">
-                        <filter  string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
                 </search>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4eebb83ce04..3426839eb5b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -296,28 +296,27 @@
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="user_id">
-                    <filter string="Unassigned Leads"
+                <filter string="Unassigned Leads"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
-                </field>
-                <field name="subjects"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}">
-                    <filter string="My Sales Team(s)"
+                <filter string="Leads Assigned to Me or My Team(s)"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team(s)"/>
-                    <filter string="Show Sales Team"
+                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <separator orientation="vertical"/>
+                <filter string="Show Sales Team"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
-                </field>
+                <field name="name" string="Lead / Customer"
+                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <field name="user_id"/>
+                <field name="subjects"/>
+                <field name="section_id" widget="selection"
+                    context="{'invisible_section': False}"/>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
                     <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
@@ -535,30 +534,33 @@
             <search string="Search Opportunities">
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
+                    name="new"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-camera_test"
                     string="Open"  help="Open Opportunities"
+                    name="open"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
                     string="Pending"  help="Pending Opportunities"
+                    name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id">
-                    <filter string="Unassigned Opportunities"
+                <filter string="Unassigned Opportunities"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
-                </field>
+               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        context="{'invisible_section': False}"
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <separator orientation="vertical"/>
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <field name="user_id"/>
                 <field name="country"/>
                 <field name="partner_id"/>
                 <field name="section_id"
                     context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter string="My Sales Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        context="{'invisible_section': False}"
-                        help="My Sales Team(s)" />
                     <filter string="Show Sales Team"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index f1461346bce..2e7ae6e1454 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -275,14 +275,14 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter string="My Meetings"
+                           <filter string="My Meetings"
                                    icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           </field>
+                           <separator orientation="vertical"/>
+                           <field name="name" string="Meeting / Partner"
+                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
                 </search>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..f62b8cfb33b 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -106,7 +106,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'default_state\':\'open\'}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2347a8322f5..ba6de07ecbf 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -179,63 +179,23 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter string="Unassigned Phonecalls"
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <separator orientation="vertical"/>
+              <filter string="Unassigned Phonecalls"
                        icon="terp-personal-"
                        domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter string="My Sales Team(s)"
+                       help="Unassigned Phonecalls"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)"
                         icon="terp-personal+"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               <field name="date"/>
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
-        </field>
-    </record>
-    <!-- Scheduled a phonecall search view-->
-    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
-        <field name="name">CRM - Scheduled Calls Search</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Scheduled Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-
+                       help="Phone Calls that are assigned to me or to my team(s)" />
                <separator orientation="vertical"/>
                <field name="name"/>
                <field name="partner_id"/>
-               <field name="user_id">
-                   <filter string="Unassigned Phonecalls"
-                       icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
+               <field name="user_id"/>
                <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter string="My Sales Team(s)"
-                        icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
+                   widget="selection" string="Sales Team"/>
                <field name="date"/>
-               </field>
                <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 569b3ba57de..dc23c256f2f 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,18 +99,16 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-
                         <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}">
-                            <filter string="My Sales Team(s)" icon="terp-personal+"
+                        <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 65ac10906b6..cd54f8e4e37 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -65,17 +65,16 @@
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
                         <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter string="My Sales Team(s)"
+                        <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Phone calls that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7bedc12dac7..224446672e7 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -210,14 +210,14 @@
                         help="All pending Claims"
                     />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                        <filter string="Unassigned Claims"
+                    <filter string="Unassigned Claims"
                             icon="terp-personal-"
                             domain="[('user_id','=', False)]"
                             help="Unassigned Claims" />
-                    </field>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 406fd828088..7d515650944 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -174,22 +174,21 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
+                            <filter string="Unassigned"
+                                    icon="terp-personal-"
+                                    domain="[('user_id','=', False)]"
+                                    help="Unassigned" />
+                            <filter string="Assigned to Me or to My Sales Team(s)" 
+                                    icon="terp-personal+"
+                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                            <separator orientation="vertical" />
                             <field name="state"/>
                             <field name="name"
                                 string="Fund Description" />
                             <field name="user_id"
-                                widget="selection">
-                                <filter string="Unassigned"
-                                    icon="terp-personal-"
-                                    domain="[('user_id','=', False)]"
-                                    help="Unassigned" />
-                            </field>
-                            <field name="section_id" widget="selection" string="Sales Team">
-                                <filter string="My Sales Team(s)" 
-                                    icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="My Sales Team(s)" />
-                            </field>
+                                widget="selection"/>
+                            <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 7d9bb596a2a..811e5a1cc90 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -164,15 +164,15 @@
                         help="All pending Helpdesk Request"
                     />
                     <separator orientation="vertical"/>
+                    <filter string="Assigned to Me or My Sales Team(s)"
+                            icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
+                    <separator orientation="vertical"/>
                     <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter string="My Sales Team(s)"
-                            icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My Sales Team(s)" />
-                    </field>
+                    <field name="section_id" widget="selection" string="Sales Team"/>
                     <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">

From a6728729630a6f85da26a5d945875a46aa19429b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 12 Jun 2012 11:20:25 +0530
Subject: [PATCH 069/161] [FIX] knowledge : Invalid XML for View Architecture.

bzr revid: mdi@tinyerp.com-20120612055025-jd4j36w0ujydzr9l
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 8f3c5cca7e7..2e5e6785438 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge">
+                <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>

From 3cca57fbccbd8f0ef110e65d1eca20367e31288a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 12 Jun 2012 12:08:15 +0530
Subject: [PATCH 070/161] [FIX] account, mail : Invalid XML for View
 Architecture.

bzr revid: mdi@tinyerp.com-20120612063815-4h3buzrhyhyq9rp1
---
 addons/account/account_view.xml                 | 2 +-
 addons/account/partner_view.xml                 | 8 ++++----
 addons/mail/report/mail_message_report_view.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a572118b478..f21137e0d32 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2371,7 +2371,7 @@
                     <field name ="complete_tax_set" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
-                        <form string="Bank Information" version="7.0">
+                        <form string="Bank Information">
                             <field name="acc_name"/>
                             <field name="account_type"/>
                             <field name="currency_id" widget="selection"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 811cac1624d..670e7d9c0ff 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <group col="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
@@ -19,7 +19,7 @@
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Tax Mapping" version="7.0">
+                        <form string="Tax Mapping">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -29,7 +29,7 @@
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Account Mapping" version="7.0">
+                        <form string="Account Mapping">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -74,7 +74,7 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="before">
+                <page string="History" position="before" version="7.0">
                 <page string="Accounting">
                     <group>
                         <group string="Customer Accounting Properties">
diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml
index 9874214b32a..10c60a30cb0 100644
--- a/addons/mail/report/mail_message_report_view.xml
+++ b/addons/mail/report/mail_message_report_view.xml
@@ -18,7 +18,7 @@
             <field name="arch" type="xml">
                 <search string="Mail message Analysis">
                     <group>
-                        <field name="create_date"/>
+                        <field name="creation_date"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">

From 6db119b7d8bba577e330e29df3449a673f1e47f7 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 13 Jun 2012 18:11:57 +0530
Subject: [PATCH 071/161] [IMP]hr_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
---
 addons/hr/hr_department_view.xml              |  3 +-
 addons/hr/hr_view.xml                         | 30 +++++++-------
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 addons/hr_contract/hr_contract_view.xml       | 32 ++++++++-------
 addons/hr_evaluation/hr_evaluation_view.xml   | 40 +++++++++----------
 addons/hr_expense/hr_expense_view.xml         | 12 +++---
 .../report/hr_expense_report_view.xml         |  1 -
 addons/hr_holidays/hr_holidays_view.xml       | 20 +++++-----
 addons/hr_payroll/hr_payroll_view.xml         | 31 +++++++-------
 .../hr_payroll_account_view.xml               |  6 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  9 ++---
 .../report/hr_recruitment_report_view.xml     | 15 +++----
 addons/hr_timesheet/hr_timesheet_view.xml     |  3 +-
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../hr_timesheet_invoice_report_view.xml      | 21 +++++-----
 .../report/report_analytic_view.xml           |  5 ++-
 .../hr_timesheet_sheet_view.xml               |  7 ++--
 17 files changed, 124 insertions(+), 117 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..3d4699c754c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -41,7 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <field name="name"/>
+                    <field name="name" string="Departments" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bed32142a39..d3e09edef72 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -108,20 +108,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="name" string="Employees" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="category_ids"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                    <separator orientation="vertical" />
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
@@ -404,6 +404,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
+                    <field name="name" string="Jobs" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"  
                             domain="[('state','=','open')]" 
                             string="In Position"
@@ -411,14 +413,12 @@
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
                         help="In Recruitment"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="department_id" widget="selection"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c2c964565ad..06d4a9e2e04 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -52,12 +52,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="name"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
-                    <field name="name"/>
                     <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 6f2ad46e913..d890f597f68 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,23 +39,25 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
-                   <separator orientation="vertical"/>
-                   <field name="name"/>
-                   <field name="employee_id"/>
-                   <field name="working_hours"/>
-                   <field name="date_start"/>
-                   <field name="date_end"/>
+                       <field name="name" string="Contracts" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
+                       <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
+                       <separator orientation="vertical"/>
+                       <field name="employee_id"/>
+                       <field name="working_hours"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                   <separator orientation="vertical"/>
-                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                       <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                       <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>
@@ -162,7 +164,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                    <field name="name"/>
+                    <field name="name" string="Contract Type" filter_domain="[('name','ilike',self)]"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index aa5ac0e90e0..2fc701ad100 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <group>
-                       <field name="name"/>
+                       <field name="name" string="Appraisal Plans" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
@@ -227,27 +228,27 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                        help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
-                    <filter icon="terp-go-month" name="next_month" string=" Month+1" 
-                         domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
-                         help="Appraisal during next month"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id" />
-                    <field name="plan_id" widget="selection" />
-                    <field name="date"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                        <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                            help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
+                        <filter icon="terp-go-month" name="next_month" string=" Month+1" 
+                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
+                             help="Appraisal during next month"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>
-                    <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
-                    <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -326,7 +327,6 @@
                 <search string="Search Appraisal">
                    <group>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 24537fc81bc..8b9b12e7672 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -135,6 +135,10 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
+                      <field name="name" string="Expenses" filter_domain="[('name','ilike',self)]"/>
+                      <separator orientation="vertical"/>
+                      <field name="date"/>
+                      <separator orientation="vertical"/>
                       <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
                       <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
                         help="Confirmed Expense"/>
@@ -142,12 +146,8 @@
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id"/>
-                      <field name="date"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                      </field>
-                      <field name="name"/>
-                      <field name="user_id"  string="User">
-                      </field>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
+                      <field name="user_id"  string="User"/>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 51cb1b99f29..20125f28a7e 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -57,7 +57,6 @@
                     help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
                       help = "Invoiced Expenses"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c48e4699215..cf2658ff1c2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,14 +8,14 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
-                        <field name="employee_id">
-                            <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        </field>
-                        <field name="department_id" widget="selection">
-                            <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        </field>
-                        <field name="holiday_status_id" widget="selection"/>
                         <field name="date_from"/>
+                        <separator orientation="vertical"/>
+                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id"/>
+                        <field name="department_id" widget="selection"/>
+                        <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -349,7 +349,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -415,7 +416,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a8bb5ea83c8..28bfa61406e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -93,8 +93,7 @@
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payroll Structures" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
                     </group>
                     <newline/>
                 </search>
@@ -212,8 +211,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payslip Lines" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -383,13 +382,14 @@
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <group>
+                        <field name="name" string="Payslips" filter_domain="['|'('name','ilike',self),('number','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
                         <field name="employee_id"/>
-                        <field name="name"/>
-                        <field name="date_from"/>
                         <field name="payslip_run_id"/>
                     </group>
                     <newline/>
@@ -464,8 +464,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" string="Salary Rule Categories" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
                </search>
             </field>
         </record>
@@ -518,7 +517,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
-                    <field name="name"/>
+                    <field name="name" string="Contribution Registers" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </search>
             </field>
@@ -648,8 +648,8 @@
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <group col="8">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Salary Rules" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
@@ -689,12 +689,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <field name="name" string="Payslip Batches" filter_domain="[('name','ilike',self)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index acc48224afa..99ff06beb6d 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -60,10 +60,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                	<newline/>
+                <filter icon="terp-camera_test" string="Done" position="after">
+                	<separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                </field>
+                </filter>
             </field>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f8873f35b81..a8604869214 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -178,6 +178,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
+               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+               <separator orientation="vertical"/>
                <filter icon="terp-document-new" string="New" 
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
@@ -190,17 +192,14 @@
                    domain="[('state','=','pending')]"
                    help="Pending Jobs"
                />
-               <separator orientation="vertical"/>
+               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]"
                     help="Filter and view on next actions and date"/>
                <separator orientation="vertical"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id">
-                    <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
-               </field>
+               <field name="user_id"/>
                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 90dce4f907d..c4e4a2f1da5 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -65,15 +65,14 @@
                            icon="terp-camera_test"
                            domain="[('state','=','done')]"
                            help = "Hired employees"/>
-                      <separator orientation="vertical"/>
-                      <field name="job_id"/>
-                    <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible">
-                        <filter icon="terp-personal"
+                    <filter icon="terp-personal"
                             string="My Recruitment"
                             help="My Recruitment"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
+                      <separator orientation="vertical"/>
+                      <field name="job_id"/>
+                    <field name="department_id" widget="selection"/>
+                    <field name="user_id" string="Responsible"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -102,9 +101,7 @@
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
-
-
-                </search>
+            </search>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ba0fb98b142..35a19193e3f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -60,9 +60,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="account_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c18ac4de667..39705f02a33 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Type of invoicing" filter_domain="[('name','ilike',self)]"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 07cffe9ea2c..e802813a1fb 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,12 +47,12 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <field name="user_id" widget="selection">
-                          <filter icon="terp-personal"
+                      <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
-                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="user_id" widget="selection"/>
                       <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="product_id"/>
                     </group>
@@ -150,9 +150,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" string="Timesheet by users" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -282,10 +283,11 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -350,10 +352,11 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c32ae7a076b..70737793834 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,10 +114,11 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" string="Analytic Lines" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="month"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 43c2e313641..290b5ce58fd 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -167,11 +167,12 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
-                        <field name="date_from"/>
                         <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -238,7 +239,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="date" position="after">
+                <field name="user_id" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>
@@ -254,7 +255,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
-                <field name="action" position="after">
+                <field name="employee_id" position="after">
                     <field name="sheet_id"/>
                 </field>
             </field>

From 0b4699a8446a54e1a6ad672ab3ab45a7c9bc2fec Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Jun 2012 11:40:42 +0530
Subject: [PATCH 072/161] [IMP]purchase_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120614061042-5uphhv6znjb3cavw
---
 addons/purchase/purchase_view.xml             | 14 +++++------
 .../purchase/report/purchase_report_view.xml  | 24 +++++++++----------
 addons/purchase/stock_view.xml                |  6 ++---
 .../purchase_requisition_view.xml             |  4 ++--
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 12151822075..100d844444e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -220,13 +220,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
+                    <field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
@@ -240,7 +240,6 @@
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -253,13 +252,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
+                    <field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"  help="Approved purchase orders"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
@@ -273,7 +272,6 @@
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -441,9 +439,9 @@
                     <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
-                        <field name="partner_id"  string="Supplier"/>
+                        <field name="partner_id" string="Supplier"/>
                     </group>
-                        <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <separator orientation="vertical"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 10672be504a..4cf91053666 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,18 +53,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        name="quotes"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-gtk-jump-to-rtl"
-                        string="Orders"
-                        name="orders"
-                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <separator orientation="vertical"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
+                <group>
+                    <filter icon="terp-document-new"
+                            string="Quotations"
+                            name="quotes"
+                            domain="[('state','=','draft')]"/>
+                    <filter icon="terp-gtk-jump-to-rtl"
+                            string="Orders"
+                            name="orders"
+                            domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3abf56c9ec4..3b064060432 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,19 +65,17 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <group col="8" colspan="4">
+                        <field name="name" string="Picking to Invoice" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available"
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                         <filter icon="terp-dialog-close" name="done" string="Received"
                             domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders"
                             domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>                    
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index dc13be5b1ec..83dd6f306b7 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -124,13 +124,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group>
+                    <field name="name" string="Purchase Requisition" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>

From c72db103165da712b0c4f9e6e7368e9dd76365b2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 11:50:14 +0530
Subject: [PATCH 073/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614062014-67g2w19n9ksz007r
---
 .../report/account_analytic_entries_report_view.xml       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 9759e31ad78..88829372096 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,12 +35,16 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group>
+                    <field name="day"
+                    filter_domain="[('day','ilike',self)]"
+                    string="Day"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
+                    <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id"/>
-                    <field name="date"/>
-                    <field name="day"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">

From 4f491cf61d02bece6407b086857c34152b8091c3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 11:52:11 +0530
Subject: [PATCH 074/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614062211-5xilxzaqph1yty04
---
 addons/account/report/account_entries_report_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 92906604f63..f2b0cceddc0 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -68,6 +68,10 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_maturity"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"
@@ -95,10 +99,6 @@
                     <field name="partner_id"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
                  </group>
                 <newline/>
                 <group expand="1" string="Group By...">

From 52757b4f15c47c400579590044ee94ccc11a459d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 11:53:29 +0530
Subject: [PATCH 075/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614062329-hmobg0z29o39gc7s
---
 addons/account/report/account_invoice_report_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b5d3881a966..c322e26d165 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,6 +56,8 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -90,7 +92,6 @@
                    <field name="partner_id"/>
                    <field name="user_id" />
                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
-                   <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">

From 78fb3a6e27ea7d707c1b676fb3c22a47257efb73 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 11:56:01 +0530
Subject: [PATCH 076/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614062601-p8f8sjp6ulb6a7g0
---
 addons/account/account_invoice_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 931769095a3..7666f1734e9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -407,22 +407,20 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group>
+                        <field name="number"
+                            string="Reference"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="number"
-                            string="Reference"
-                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection" string="Salesperson"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id" string="Period"/>
                     </group>

From e5390a33bb65d17e792e9e587d24aed5e4d8aed8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 11:58:22 +0530
Subject: [PATCH 077/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614062822-im29b27wgwavbmjv
---
 addons/account/report/account_report_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index eae45c12815..d0dfc990522 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -151,7 +151,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Year"/>
                     <field name="month"/>
                </search>
             </field>
@@ -214,7 +216,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Year"/>
                     <field name="month"/>
                </search>
             </field>

From 2f2fccdd22fd1e3ba53dbb1051755637fc3e12e0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:01:00 +0530
Subject: [PATCH 078/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614063100-v5eybpqmatu8xgx4
---
 addons/account/report/account_treasury_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index eceb1e5c760..a4538a90055 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                 <newline/>
+                <newline/>
             </search>
         </field>
     </record>

From 9bf1ac7f43462b6031a068a2a9325c1d570b7df5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:06:22 +0530
Subject: [PATCH 079/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614063622-7xxt88fhhfsmw4xq
---
 addons/account/account_view.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f21137e0d32..7bae6f3d38e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -65,11 +65,13 @@
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Fiscal Year"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
                         <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="state"/>
                     </group>
                     <newline/>
@@ -141,10 +143,11 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Period"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                     </group>
                 </search>
             </field>

From 2af5d0f1411b9d1b4ba8163abadb8d4c60efbeb2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:10:03 +0530
Subject: [PATCH 080/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614064003-564awk5en5gb36oa
---
 addons/account/account_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7bae6f3d38e..72677981bc2 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -220,11 +220,13 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Account"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="user_type"/>
                     </group>
                     <newline/>

From d0cd006418841a027cc53271eee26faa460d15e0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:11:49 +0530
Subject: [PATCH 081/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614064149-5b3ireayw30w4j0d
---
 addons/account/account_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 72677981bc2..b38bf40a29f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -384,7 +384,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Journal View"/>
                 </search>
             </field>
         </record>

From a261d769385968fffa0737b807921e6086e6d8c7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:15:16 +0530
Subject: [PATCH 082/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614064516-1xge1f7rq1k50efi
---
 addons/account/account_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b38bf40a29f..6df2b8895ae 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -447,13 +447,15 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <group>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                    string="Journal"/>
+                    <separator orientation="vertical"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="user_id"/>
                     </group>
                     <newline/>

From c0e7da0dd172926e7a15c3d437738846029450d1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:20:04 +0530
Subject: [PATCH 083/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614065004-fa3bm9b7p1my2h5j
---
 addons/account/account_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6df2b8895ae..359c3a617dd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -530,12 +530,15 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Bank Statement"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                         <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
                     </group>
                     <newline/>

From 226408651bc9be179c491da0078f6e39f3ebc458 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:23:08 +0530
Subject: [PATCH 084/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614065308-h96ax6i17nohubld
---
 addons/account/account_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 359c3a617dd..e5dcd3f9640 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -576,11 +576,14 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Bank Statement"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="date"/>
                         <field name="period_id"/>
                         <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
                     </group>

From 67e6d46ad08927a27f67d778c788757de684ef08 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:25:06 +0530
Subject: [PATCH 085/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614065506-j7gpjsin3pakcgu6
---
 addons/account/account_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e5dcd3f9640..eac0994edbf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -708,8 +708,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Type">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                    string="Account Type"/>
                 </search>
             </field>
         </record>

From e6c2875caa13395564641fe608ff1b6c64971d3f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:28:20 +0530
Subject: [PATCH 086/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614065820-xz77lkhvy6k32rf2
---
 addons/account/account_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index eac0994edbf..77c708e11d2 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -810,8 +810,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Tax Code">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                    string="Tax Code"/>
                     <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>

From a0c7792e743c52d96cac7bd92094016b7e352ca6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:31:09 +0530
Subject: [PATCH 087/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614070109-1pdoynmzelku9h15
---
 addons/account/account_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 77c708e11d2..6161cd5dcf7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -898,8 +898,9 @@
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <group>
-                        <field name="name"/>
-                        <field name="description"/>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]"
+                        string="Tax"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>

From d20ee477d5ca6806efba5eb2c5d0fb7899d703c0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:36:48 +0530
Subject: [PATCH 088/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614070648-iox3jx2e4gc0rl6j
---
 addons/account/account_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6161cd5dcf7..49901625b5a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1165,6 +1165,8 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1179,12 +1181,8 @@
                         <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         <separator orientation="vertical"/>
                         <field name="move_id" string="Number (Move)"/>
-                        <field name="date"/>
                         <field name="account_id"/>
                         <field name="partner_id"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
                         <field name="period_id" context="{'period_id':self}"/>
                     </group>

From 8e983d42c2776de2e8818f999e50ce0a26e461a4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:40:50 +0530
Subject: [PATCH 089/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614071050-co8fa35bk80jw4w9
---
 addons/account/account_view.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 49901625b5a..ec34cc09c7b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1408,18 +1408,17 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                        string="Move"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="partner_id"/>
-                        <field name="date"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>

From a85126a5cc596d839b73fc4ccc4e1bbb147ca928 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 14 Jun 2012 12:43:13 +0530
Subject: [PATCH 090/161] [IMP]sale_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120614071313-4cqcxpqsx6ad417b
---
 addons/sale/sale_view.xml         | 45 ++++++++++++-------------------
 addons/sale_crm/sale_crm_view.xml | 10 +++----
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e028eb8d044..16f0246ab6f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -90,6 +90,7 @@
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
+                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
@@ -148,16 +149,11 @@
                         <page string="Order Lines">
                             <field name="order_line">
                                 <form string="Sales Order Lines" version="7.0">
-                                    <header>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                                    </header>
-                                    <group col="4" colspan="4">
-                                        <group>
-                                            <field name="product_id"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                            <field name="name" placeholder="Product/Service characteristics"/>
-                                        </group>
+                                    <field name="product_id"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                    <field name="name" placeholder="Porduct/Service characteristics"/>
+                                    <group>
                                         <group>
                                             <label for="product_uom_qty"/>
                                             <div>
@@ -176,16 +172,14 @@
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                        </group>
-                                    </group>
-                                    <group>
-                                        <group>
+                                        </group><group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
+                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                             <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
                                         <group col="4">
@@ -195,7 +189,7 @@
                                             <field name="address_allotment_id"/>
                                         </group>
                                         <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids" colspan="4" nolabel="1" />
+                                        <field name="property_ids"/>
                                         <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal"/>
                                         <div groups="base.group_no_one">
@@ -280,17 +274,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order" filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     <separator orientation="vertical"/>
-                    <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
-                    <field name="user_id">
-                        <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
-                    </field>
+                    <field name="user_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -446,13 +438,12 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -472,16 +463,14 @@
                 <search string="Search Uninvoiced Lines">
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 447abdefb58..c71906618de 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='stage_previous']" position="before">
+                    <field name="state" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </xpath>
+                    </field>
                 </data>
             </field>
         </record>
@@ -36,12 +36,12 @@
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter string="My Sales Team(s)"
+                    <field name="section_id" widget="selection" string="Sales Team"/>
+                    <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)"/>
-                    </field>
+                    
                 </field>
             </field>
         </record>

From f2656f6f9942adf6e64f8c3358d02cc9f8c81bd3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:45:43 +0530
Subject: [PATCH 091/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614071543-ylskuxo0wecxuv5a
---
 addons/account/account_view.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ec34cc09c7b..3634bb4600a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1637,17 +1637,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                  <group>
-                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
-                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
-                    <separator orientation="vertical"/>
-                      <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Journal Entry Model"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                        <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
                 </search>
             </field>

From 3ebad710ef23cc7be343a79b7f1665846e66f17a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:48:16 +0530
Subject: [PATCH 092/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614071816-51qmr1rxcpoxts3l
---
 addons/account/account_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3634bb4600a..12685a506e7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1733,7 +1733,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>

From aa2f9b477eff5f0e3bbd60017690a1d0e6e8b725 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:51:53 +0530
Subject: [PATCH 093/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614072153-pxyf6p2m5befliof
---
 addons/account/account_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 12685a506e7..eeaf1753921 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1821,12 +1821,15 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Account Subscription"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="model_id"/>
-                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From d229dfa236aea8e8e9bd9a60793273f35837c2ff Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 12:58:25 +0530
Subject: [PATCH 094/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614072825-2701wjpbclyp3bmg
---
 addons/account/account_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index eeaf1753921..e6af5406c57 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2094,14 +2094,16 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                        <separator orientation="vertical"/>
                         <field name="parent_id"/>
-                        <field name="type"/>
                         <field name="user_type"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From a5265c1f21b7eff031d6b240ed70c79e26f241d4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:12:39 +0530
Subject: [PATCH 095/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614084239-rc5rmiwgfwru5yzg
---
 addons/account/account_view.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e6af5406c57..cbae025c395 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2164,13 +2164,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                      <group>
-                        <field name="name"/>
+                    <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
-                      </group>
-                      <newline/>
-                      <group expand="0" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
@@ -2179,7 +2182,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
-                      </group>
+                    </group>
                 </search>
             </field>
         </record>

From a37bf8312b99bf390af39a674caad8cbdf500a7c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:17:13 +0530
Subject: [PATCH 096/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614084713-9mua9sjxam14b39y
---
 addons/account/account_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cbae025c395..94084306ed4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2289,11 +2289,13 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]"
+                        string="Tax Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="description"/>
                         <field name="chart_template_id"/>
                     </group>
                 </search>

From 4849711b85ef03f9187c271d5335026502c3a26e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:19:57 +0530
Subject: [PATCH 097/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614084957-23sgythqgyuzciyv
---
 addons/account/account_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 94084306ed4..d31a981b238 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2334,8 +2334,9 @@
             <field name="arch" type="xml">
                 <search string="Search tax template">
                     <group>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Tax Template"/>
                         <field name="parent_id"/>
                     </group>
                     <newline/>

From 7fc7b65ec510eeeb2a7f6deae7379dbd80161c56 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:22:00 +0530
Subject: [PATCH 098/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614085200-dzm95qritch4ydo6
---
 addons/account/account_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d31a981b238..1bf0e99ed37 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2474,7 +2474,9 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Fiscal Position Template"/>
                 </search>
             </field>
         </record>

From c558535b2228749ad8f53a688ee9a90eba77c0ff Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:25:22 +0530
Subject: [PATCH 099/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614085522-ank8w84xukndf1i9
---
 addons/account/account_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1bf0e99ed37..3c30390b633 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2766,9 +2766,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <group>
-                        <field name="name"/>
-                        <field name="type"/>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Account Report"/>
                         <field name="account_report_id"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 2a7ee8cf0b19bfec53babbc62bbd6ca25bdd97c5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:35:44 +0530
Subject: [PATCH 100/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614090544-gg397w15uhgyndye
---
 addons/account/project/project_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7ffe262b09f..896bfffa76f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -30,13 +30,15 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Analytic Account"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>

From 59d668b4becc46bf20fbcee4d82ba4d8511c89c0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:38:50 +0530
Subject: [PATCH 101/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614090850-0t3fpfbsq69k1b5m
---
 addons/account/project/project_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 896bfffa76f..327f7af604f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -222,16 +222,18 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Analytic Line"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                        <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">

From b53379648a15a48a9b4195e1a495c19b30975f1e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 14:46:31 +0530
Subject: [PATCH 102/161] [IMP] account : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614091631-3u65lfridm0de3qz
---
 addons/account/project/project_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 327f7af604f..3c2fb2ac336 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -329,12 +329,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                  <group>
-                      <field name="code"/>
-                      <field name="name"/>
-                      <field name="type"/>
-                  </group>
-                  <newline/>
+                    <group>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Analytic Journal"/>
+                        <field name="type"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>

From 790d6e7c0c9b0eb829529b4d3868f83bc2b30840 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 15:22:14 +0530
Subject: [PATCH 103/161] [IMP] account_analytic_analysis : Improved the Search
 View.

bzr revid: mdi@tinyerp.com-20120614095214-9dtfjvtv964moydi
---
 .../account_analytic_analysis_menu.xml                       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index a019fd08793..2e93e62d0ac 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -20,6 +20,9 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group col="8" colspan="4">
+                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
                         <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
                         <separator orientation="vertical"/>
@@ -30,10 +33,8 @@
                         <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                         <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         <separator orientation="vertical"/>
-                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                         <field name="partner_id"/>
                         <field name="user_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 64bde99049fdfa0dc42e13195202a1e299662bff Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 15:32:28 +0530
Subject: [PATCH 104/161] [IMP] account_analytic_default : Improved the Search
 View.

bzr revid: mdi@tinyerp.com-20120614100228-6bntcmle7ebz84d7
---
 .../account_analytic_default_view.xml         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index c4e8c16f70a..beb4dcbd34e 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -47,20 +47,20 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
-                    <separator orientation="vertical"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_stop"/>
+                        <separator orientation="vertical"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-						<separator orientation="vertical"/>
-						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
                          <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />

From 29d669b8d589dcd6e2639ff5764cd2a1930041af Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 15:34:37 +0530
Subject: [PATCH 105/161] [IMP] account_analytic_plans : Improved the Search
 View.

bzr revid: mdi@tinyerp.com-20120614100437-83382ulkgj2md702
---
 addons/account_analytic_plans/account_analytic_plans_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 265f71d690f..ab78ea04fe5 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -196,7 +196,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
-                <field name="name"/>
+                <field name="name"
+                filter_domain="[('name','ilike',self)]"
+                string="Analytic Plan"/>
             </search>
         </field>
     </record>

From da37395051062dea977770fe4d0fa527323ab7b1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 15:45:24 +0530
Subject: [PATCH 106/161] [IMP] account_asset : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614101524-334to0e8jv7cd0a3
---
 addons/account_asset/account_asset_view.xml           | 11 ++++++++---
 .../report/account_asset_report_view.xml              |  5 +++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 01144c153e5..bb2d4a7bdd8 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -64,7 +64,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
-                <field name="name"/>
+                <field name="name"
+                filter_domain="[('name','ilike',self)]"
+                string="Asset Category"/>
                 <field name="journal_id"/>
             </search>
         </field>
@@ -204,12 +206,15 @@
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <group col="10" colspan="12">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Asset"/>
+                    <field name="purchase_date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_id"/>
-                    <field name="purchase_date"/>
                     <field name="partner_id"/>
                 </group>
             </search>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index cb529ae660d..f06e857cf7a 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,6 +44,9 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
+                    <field name="purchase_date"/>
+                    <field name="depreciation_date"/>
+                    <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                     <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
                     <separator orientation="vertical"/>
@@ -52,12 +55,10 @@
                     <separator orientation="vertical"/>
                     <field name="asset_id"/>
                     <field name="asset_category_id"/>
-                    <field name="depreciation_date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
-                    <field name="purchase_date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>

From ff1c79989f120c151d1a60c8732e9012eb6ce82c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 15:55:58 +0530
Subject: [PATCH 107/161] [IMP] account_bank_statement_extensions : Improved
 the Search View.

bzr revid: mdi@tinyerp.com-20120614102558-pd8cgq2iyfhrkno5
---
 .../account_bank_statement_view.xml           | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index d806760a85b..023a794fb26 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -118,41 +118,43 @@
     </record>
 
     <record id="view_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">bank.statement.line.filter</field>
-      <field name="model">account.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
-            <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
-            <separator orientation="vertical"/>
-            <field name="journal_id"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-          </group>
-          <newline/>
-          <group string="Extended Filters..." expand="0">
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="1">
-            <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">bank.statement.line.filter</field>
+        <field name="model">account.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group col='6' colspan='4'>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                    string="Bank Transaction"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
+                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group string="Extended Filters..." expand="0">
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="1">
+                    <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_bank_statement_line" model="ir.actions.act_window">

From 8247ac182ed9454eed94f0d3649e4ba8f51879d4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 16:01:54 +0530
Subject: [PATCH 108/161] [IMP] account_budget : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614103154-zf6zu0cian0w67m4
---
 addons/account_budget/account_budget_view.xml | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 363373b3204..09ae38a5204 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -18,8 +18,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
-                    <field name="code"/>
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                    string="Budgetary Position"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -180,17 +181,19 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group>
-                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                       <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="code" />
-                       <field name="state"/>
-                       <field name="date_from"/>
-                       <field name="date_to"/>
-                   </group>
-               </search>
-           </field>
+                        <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                        string="Budget"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                        <separator orientation="vertical"/>
+                        <field name="state"/>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">

From 53f33a840eeef0a943231b2631f8c8ecb115081a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 16:32:34 +0530
Subject: [PATCH 109/161] [IMP] account_coda : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614110234-ai0ib21nx3sxk5j8
---
 addons/account_coda/account_coda_view.xml | 159 +++++++++++-----------
 1 file changed, 83 insertions(+), 76 deletions(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 7be5c4b8024..fce3c2c2ccc 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -7,27 +7,29 @@
 
     <!-- CODA Bank Account Configuration -->
     <record id="view_coda_bank_account_search" model="ir.ui.view">
-      <field name="name">coda.bank.account.search</field>
-      <field name="model">coda.bank.account</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-          <search string="CODA Bank Account Configuration">
-              <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-              <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-              <separator orientation="vertical"/>
-              <field name="name"/>
-              <field name="bank_id"/>
-              <field name="description1"/>
-              <field name="journal"/>
-              <field name="currency" widget="selection"/>
-              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              <newline/>
-              <group expand="0" string="Group By...">
-                <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
-              </group>
-          </search>
-      </field>
+        <field name="name">coda.bank.account.search</field>
+        <field name="model">coda.bank.account</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="CODA Bank Account Configuration">
+                <field name="name"
+                filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
+                string="CODA Bank Account"/>
+                <separator orientation="vertical"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
+                <separator orientation="vertical"/>
+                <field name="bank_id"/>
+                <field name="journal"/>
+                <field name="currency" widget="selection"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                </group>
+            </search>
+        </field>
     </record>
     <record id="view_coda_bank_account_list" model="ir.ui.view">
       <field name="name">coda.bank.account.list</field>
@@ -378,28 +380,31 @@
     </record>
 
     <record id="view_coda_bank_statement_search" model="ir.ui.view">
-      <field name="name">coda.bank.statement.search</field>
-      <field name="model">coda.bank.statement</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search CODA Bank Statements">
-          <group col="8" colspan="4">
-            <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-            <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
-            <separator orientation="vertical"/>
-            <field name="name"/>
-            <field name="date"/>
-            <field name="period_id"/>
-            <field name="coda_bank_account_id"/>
-            <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-            <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.search</field>
+        <field name="model">coda.bank.statement</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search CODA Bank Statements">
+                <group col="8" colspan="4">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="CODA Bank Statement"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                    <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
+                    <separator orientation="vertical"/>
+                    <field name="period_id"/>
+                    <field name="coda_bank_account_id"/>
+                    <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                    <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record model="ir.actions.act_window" id="action_coda_bank_statements">
@@ -467,39 +472,41 @@
     </record>
 
     <record id="view_coda_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">coda.bank.statement.line.filter</field>
-      <field name="model">coda.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-            <field name="type"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Extended Filters...">
-            <field name="coda_bank_account_id"/>
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="0">
-            <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.line.filter</field>
+        <field name="model">coda.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group col='6' colspan='4'>
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                    string="Bank Transaction"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="coda_bank_account_id"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="type"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="0">
+                    <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_coda_bank_statement_line" model="ir.actions.act_window">

From cbc9d77c02ec09598340b465d9feee83ada1a2cd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 16:59:13 +0530
Subject: [PATCH 110/161] [IMP] account_followup : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614112913-8myzbmgwtqaaialx
---
 .../account_followup_view.xml                 | 10 +--
 .../report/account_followup_report.xml        | 69 ++++++++++---------
 .../wizard/account_followup_print_view.xml    | 17 ++---
 3 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 89423327d68..a3ae84edc29 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group>
-                        <field name="name"/>
+                    <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Followup"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 5ba0e147bf8..9627d12aa88 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -34,41 +34,42 @@
                </graph>
            </field>
       </record>
-	 <record id="view_account_followup_stat_search" model="ir.ui.view">
-        <field name="name">account_followup.stat.search</field>
-        <field name="model">account_followup.stat</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Follow-ups Sent">
-              <group>
-              <filter icon="terp-go-year" string="This Fiscal year"
-			              name="fiscalyear"
-			              domain="[('period_id','in','current_year')]"
+        <record id="view_account_followup_stat_search" model="ir.ui.view">
+            <field name="name">account_followup.stat.search</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Follow-ups Sent">
+                    <group>
+                        <field name="date_move"/>
+                        <field name="date_move_last"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-year" string="This Fiscal year"
+                            name="fiscalyear"
+                            domain="[('period_id','in','current_year')]"
                             help="Follow up Entries with period in current year"/>
-              <separator orientation="vertical"/>
-              <filter icon="terp-camera_test" string="Not Litigation"
-              			   domain="[('blocked','=', False)]"
-                           help = "Including journal entries marked as a litigation"/>
-              <separator orientation="vertical"/>
-              <field name="partner_id"/>
-              <field name="balance" />
-              <field name="date_move" />
-              <field name="date_move_last" />
-              </group>
-              <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
-                    <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
-                </group>
-            </search>
-        </field>
-    </record>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="Not Litigation"
+                            domain="[('blocked','=', False)]"
+                            help = "Including journal entries marked as a litigation"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="balance"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
+                        <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_followup_stat" model="ir.actions.act_window">
             <field name="name">Follow-ups Sent</field>
             <field name="res_model">account_followup.stat</field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 8a592f01ac2..32b6383a8cc 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -36,21 +36,22 @@
                   parent="account.menu_finance_periodical_processing_billing"
                   sequence="10"/>
 
-           <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
+        <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
             <field name="model">account_followup.stat.by.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
-                   <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="max_followup_id"/>
-                   <field name="date_followup"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date_followup"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="max_followup_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
-           </record>
+        </record>
 
        <!-- Screen2 -->
            <record id="account_followup_stat_by_partner_tree" model="ir.ui.view">

From 56c742044bb1e44eed0983d96c15c293a2174268 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 17:03:10 +0530
Subject: [PATCH 111/161] [IMP] account_invoice_layout : Improved the Search
 View.

bzr revid: mdi@tinyerp.com-20120614113310-7o19lb1zb2srb7p9
---
 addons/account_invoice_layout/account_invoice_layout_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 8e18ec51d5b..21d245db15f 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -74,7 +74,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Messages">
-                <field name="name"/>
+                <field name="name"
+                filter_domain="[('name','ilike',self)]"
+                string="Message"/>
                 <field name="msg"/>
             </search>
         </field>

From 1a4c5d25f6fd9d78989df951ee196486af7ff7c7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 17:14:27 +0530
Subject: [PATCH 112/161] [IMP] account_payment : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614114427-6fnnn43laub4g0mi
---
 addons/account_payment/account_payment_view.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 45f42a3ab1a..cdcf83c7564 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -47,12 +47,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
-                    <field name="name"/>
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Payment Mode"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
                 </search>
             </field>
@@ -208,13 +210,16 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <group>
+                        <field name="reference"
+                        filter_domain="[('reference','ilike',self)]"
+                        string="Payment Order"/>
+                        <field name="date_done"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="reference"/>
                         <field name="mode" widget='selection'/>
-                        <field name="date_done"/>
                         <field name="state"/>
                     </group>
                     <newline/>

From b3d5abbbe37ccec467f3c31380d1894e60a9023a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 17:41:47 +0530
Subject: [PATCH 113/161] [IMP] account_voucher : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614121147-hzckiwjhisgvk5tv
---
 .../account_voucher/account_voucher_view.xml  |  7 +-
 .../account_voucher_sales_receipt_view.xml    |  8 +-
 .../voucher_payment_receipt_view.xml          | 14 +++-
 .../voucher_sales_purchase_view.xml           | 81 +++++++++----------
 4 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 586d06449c8..125926bf124 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -123,13 +123,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index aeea50a0b1a..702b65f5fb1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,6 +49,9 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
+                    <field name="date"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -68,11 +71,8 @@
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
-                    <field name="pay_now"/>
                     <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <field name="date"/>
+                    <field name="pay_now"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 150830431ca..c368f6fd8af 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,13 +9,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
@@ -42,13 +45,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b0a81461334..1b3c1334b36 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,13 +8,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
@@ -40,13 +43,17 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
@@ -90,32 +97,15 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <div class="oe_form_title">
-                        <label for="number" class="oe_form_readonly_hidden"/>
-                        <h1><field name="number" readonly="0" /></h1>
-                    </div>
-
-                    <group>
-                        <group>
-                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                            <field name="name" colspan="2"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                        <group>
-                            <field name="currency_id"/>
-                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                            <field name="account_id"
-                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                  domain="[('type','=','liquidity')]"/>
-                            <field name="reference"
-                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                            />
-                            <field name="paid" invisible="1"/>
-                        </group>
+                    <group col="6">
+                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                        <field name="number"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -128,21 +118,26 @@
                                 </tree>
                             </field>
                             <group col="3">
-                                <group colspan="1">
-                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                <group string="Internal Notes" col="1">
+                                    <field name="narration"/>
                                 </group>
-                                <group>
-                                    <group class="oe_form_subtotal_footer" string="Total">
-                                        <field name="tax_id" 
-                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                            widget="selection"
-                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                        <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
-                                        <button type="object"
-                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                            attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    </group>                                    
+                                <group col="2">
+                                    <separator string="Payment Options" colspan="2"/>
+                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                                    <field name="account_id"
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                          domain="[('type','=','liquidity')]"/>
+                                         <!-- should select income accounts only. Or use the journal for this ? -->
+                                    <field name="reference"
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                    />
+                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                                    <field name="paid" invisible="1"/>
+                                </group>
+                                <group col="4">
+                                    <separator string="Total" colspan="4"/>
+                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>

From 23ab07f42932c54d82db525f7e0e4d9b6daf148f Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Jun 2012 17:47:57 +0530
Subject: [PATCH 114/161] [IMP]stock_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120614121757-dm50zbijxuj0ivd3
---
 .../stock/report/report_stock_move_view.xml   |  34 ++-
 addons/stock/report/report_stock_view.xml     |   4 +-
 addons/stock/stock_view.xml                   | 211 +++++++++---------
 addons/stock_planning/stock_planning_view.xml |   9 +-
 4 files changed, 126 insertions(+), 132 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index d6ab3c4674f..d40f6dbdbfd 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -67,22 +67,21 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter string="Done"
-                    name="done"
-                    icon="terp-dialog-close"
-                    domain="[('state','=','done')]"
-                    help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                    icon="terp-gtk-go-back-rtl"
-                    domain="[('state','in',('assigned','waiting','confirmed'))]"
-                    help = "Future Stock-Moves"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <filter string="Done"
+                        name="done"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help = "Completed Stock-Moves"/>
+                    <filter string="Todo"
+                        icon="terp-gtk-go-back-rtl"
+                        domain="[('state','in',('assigned','waiting','confirmed'))]"
+                        help = "Future Stock-Moves"/>
+                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -180,13 +179,10 @@
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-
                     <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-
-                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id" default_focus="1"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 51236e47962..69a7829f565 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -34,16 +34,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
-                    <field name="date"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 458af2b58dc..6d9869fe904 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,8 +78,10 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
@@ -119,20 +121,15 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
-                            <label for="name"  /> 
-                        </div>
-                        <h1>
-                            <field name="name" placeholder="Annual inventory"/>
-                        </h1>
-                    </div>
                 <group>
-                    <group>
+                    <label for="name" clas="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" placeholder="Annual invetory 2013"/>
+                    </h1>
+                    <group col="4">
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -187,6 +184,7 @@
                          </field>
                     </page>
                     </notebook>
+                    </group>
                     </sheet>
                 </form>
             </field>
@@ -283,8 +281,8 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|'('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
                         <field name="active"/>
                     </group>
@@ -390,13 +388,13 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|'('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -552,6 +550,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
@@ -559,7 +559,6 @@
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -787,62 +786,62 @@
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
+                                        <field name="state" widget="statusbar"/>
                                     </header>
                                     <group>
-                                        <group string="Move Information">
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div>
-                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
+                                    <group string="Move Information">
+                                        <field name="name" invisible="1"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                        <label for="product_qty"/>
+                                        <div>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                    string="Scrap" type="action"
+                                                    icon="gtk-convert" context="{'scrap': True}"
+                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                        </div>
+                                        <label for="product_uos_qty" groups="product.group_uos"/>
+                                        <div>
+                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                        </div>
+                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                    </group>
 
-                                        <group string="Dates">
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
+                                    <group string="Locations" groups="stock.group_locations">
+                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                        <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                    </group>
 
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                        </group>
+                                    <group string="Dates">
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
+                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                    </group>
 
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <label for="tracking_id"/>
-                                            <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
-                                                <button name="%(split_into)d" string="New Pack" type="action"
-                                                      groups="product.group_stock_packaging"
-                                                      icon="terp-stock_effects-object-colorize"
-                                                      states="draft,assigned,confirmed"/>
-                                            </div>
+                                    <group groups="stock.group_tracking_lot" string="Traceability">
+                                        <label for="tracking_id"/>
+                                        <div>
+                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                            <button name="%(split_into)d" string="New Pack" type="action"
+                                                  groups="product.group_stock_packaging"
+                                                  icon="terp-stock_effects-object-colorize"
+                                                  states="draft,assigned,confirmed"/>
+                                        </div>
 
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
+                                        <label for="prodlot_id"/>
+                                        <div>
+                                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                            <button name="%(track_line)d"
+                                                groups="stock.group_tracking_lot"
+                                                states="draft,waiting,confirmed,assigned"
+                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                        </div>
+                                    </group>
                                     </group>
                                 </form>
                             </field>
@@ -872,12 +871,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|'('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
@@ -984,16 +983,14 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|'('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1098,15 +1095,13 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
@@ -1223,37 +1218,32 @@
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty"
-                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
-                                    class="oe_form_inline"/>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
-                            <label for="product_uso_qty" />
-                            <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
-                                    class="oe_form_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
-                            </div>
-                            <field name="name" string="Reason"/>
-                        </group>
-                        <group>
-                            <field name="picking_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
+                        </group>
+                        <group string="Move Information">
+                            <field name="name" string="Reason"/>
+                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
+                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        </group>
+                        <group string="Picking" name="picking">
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group string="Dates">
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-
                         </group>
-                        <group>
+                        <group string="Traceability">
                             <label for="tracking_id"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
@@ -1288,17 +1278,18 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
@@ -1427,13 +1418,16 @@
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
                         <field name="name" string="Reason"/>
-                    </group>
-                    <group>
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group><group>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
                         <field name="partner_id"/>
+                    </group>
+                    <group name="picking">
+                        <field name="picking_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <group>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@@ -1474,13 +1468,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1505,13 +1499,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1700,7 +1694,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0ae33cec3af..c13e056161b 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,12 +50,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <field name="name" string="Stock Periods" filter_domain="[('name','ilike',self)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
             </field>
         </record>
@@ -198,6 +199,7 @@
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
@@ -304,6 +306,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>

From 9896c1cacda0a8f0bcaf2a42b9e43228fdcefedc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 14 Jun 2012 18:34:06 +0530
Subject: [PATCH 115/161] [IMP] audittrail : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120614130406-t1f2dbjxmwta19yl
---
 addons/audittrail/audittrail_view.xml | 51 +++++++++++++++------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 295ff2793d5..5f8e2392842 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -61,17 +61,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                </group>
+                    <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Audittrail Rule"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -166,18 +169,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="user_id"  widget="selection"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
-                </group>
+                    <group>
+                        <field name="name"
+                        filter_domain="[('name','ilike',self)]"
+                        string="Audittrail Log"/>
+                        <field name="object_id"/>
+                        <field name="user_id"  widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                    </group>
                 </search>
             </field>
         </record>

From 1cc4bcff72c15e0da31aaf85a5641e047820b6ab Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 11:08:19 +0530
Subject: [PATCH 116/161] [IMP] base_calendar : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615053819-drgrp3lgck1vk1n1
---
 addons/base_calendar/base_calendar_view.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5c83337044c..a20e61e5245 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,6 +94,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <field name="email"
+                   filter_domain="[('email','ilike',self)]"
+                   string="Email"/>
+                   <field name="event_date"/>
+                   <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        help="Invitations To Review" />
@@ -107,11 +112,9 @@
                        domain="[('state','=', 'delegated')]"
                        help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email"/>
                    <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type"/>
-                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -435,6 +438,10 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
+                           <field name="name"
+                           filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]"
+                           string="Event"/>
+                           <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -443,9 +450,6 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" string="Summary"/>
-                           <field name="location" string="Location"/>
-                           <separator orientation="vertical"/>
                            <field name="user_id"/>
                            <separator orientation="vertical"/>
                            <field name="show_as"/>
@@ -465,7 +469,6 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-
                         </group>
                 </search>
             </field>

From 3e3a234cf0264294f2b7b13d81d6b421265c51fe Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Jun 2012 11:17:10 +0530
Subject: [PATCH 117/161] [IMP]mrp_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120615054710-gsgycbzi3ie60481
---
 addons/mrp/mrp_view.xml                       | 22 +++++------
 addons/mrp/report/mrp_report_view.xml         |  3 +-
 addons/mrp_operations/mrp_operations_view.xml | 37 ++++++++++---------
 .../report/mrp_workorder_analysis_view.xml    |  5 ++-
 addons/mrp_repair/mrp_repair_view.xml         |  4 +-
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b2ace70fc08..acc4002289f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -82,9 +82,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                    <group>
-                       <field name="name"/>
-                       <field name="composition"/>
+                       <field name="name" string="Name" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <field name="group_id"  widget="selection" />
+                       <field name="composition"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -188,10 +189,10 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group>
+                        <field name="name" string="mrp workcenter" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="resource_type"/>
                    </group>
                    <newline/>
@@ -287,10 +288,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
+                    <field name="name" string="Routing" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
@@ -387,8 +388,8 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group>
-                         <field name="name"/>
-                         <field name="code" string="Reference"/>
+                         <field name="name" string="Bill Of Material" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                         <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </group>
@@ -774,6 +775,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group>
+                       <field name="name" string="Production" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -783,15 +786,12 @@
                        <filter icon="terp-check" string="In Production" name="inprogress"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are currently in production."/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                       <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fa68d1bdcff..4e03aa4d9d6 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -36,7 +36,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
-                    <field name="name"/>
+                    <field name="name" string="Work Center load" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="workcenter_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..8b883fe15b5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -124,24 +124,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <search string="Search Work Orders">
-                        <group>
-                           <filter icon="terp-document-new" string="Draft"
-                               domain="[('state','=','draft')]"/>
-                           <filter icon="terp-check" string="In Progress" name="Current"
-                               domain="[('state','=','startworking')]"/>
-                           <filter icon="terp-gtk-media-pause" string="Pending"
-                               domain="[('state','=','pause')]"/>
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                               domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                               help="Production started late" />
-                           <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="workcenter_id" widget="selection"/>
-                            <field name="production_id" />
-                            <field name="state" />
-                            <field name="date_planned"/>
-                        </group>
+                    <group>
+                       <field name="name" string="Work Orders" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_planned"/>
+                       <separator orientation="vertical"/>
+                       <filter icon="terp-document-new" string="Draft"
+                           domain="[('state','=','draft')]"/>
+                       <filter icon="terp-check" string="In Progress" name="Current"
+                           domain="[('state','=','startworking')]"/>
+                       <filter icon="terp-gtk-media-pause" string="Pending"
+                           domain="[('state','=','pause')]"/>
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                           help="Production started late" />
+                       <separator orientation="vertical"/>
+                        <field name="workcenter_id" widget="selection"/>
+                        <field name="production_id" />
+                        <field name="state" />
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 5d78ab9b83e..543024b6354 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,13 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
-                        <field name="date"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index ce11787a88e..6511510893f 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -191,13 +191,13 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group>
+                       <field name="name" string="Reair Orders" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="partner_id"/>
                        <field name="state" />

From 8a296b31e38349fe74801052211adfaf90def32d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 11:26:41 +0530
Subject: [PATCH 118/161] [IMP] board : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615055641-vqp8a1efxxnztuod
---
 addons/board/board_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 231d1956cca..0ce5e2aa2dc 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,7 +8,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name"/>
+                <field name="name"
+                filter_domain="[('name','ilike',self)]"
+                string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>

From 39ac1a9d01820b6dc3fe42eb122b7d2c7c47731a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 11:39:26 +0530
Subject: [PATCH 119/161] [IMP] caldav : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615060926-q903zbkslnmxxgsz
---
 addons/caldav/caldav_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index e4e0679a710..2fed2fa3f98 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,16 +158,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Calendar"/>
+                    <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
                     <separator orientation="vertical"/>
                     <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="type"/>
                     <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>

From b6b9cd6cef90e7f4c5a8ea63ec056d5ba6b71fbb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 12:46:30 +0530
Subject: [PATCH 120/161] [IMP] document : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615071630-wac91o7rqwvziu56
---
 addons/document/document_view.xml             | 20 ++++++++++++-------
 .../document/report/document_report_view.xml  |  8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 20a72c9d4f1..cfb07767319 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -39,8 +39,10 @@
             <field name="model">document.storage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Document storage">
-                    <field name="name" />
+                <search string="Search Document Storage">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Document Storage"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -171,10 +173,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Document Directory"/>
+                    <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" />
                     <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
@@ -289,13 +294,14 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-                <field name="create_uid" position="replace">
-                    <field name="user_id">
-                        <filter string="My Document(s)"
+                <filter string="My Document(s)" position="replace">
+                    <filter string="My Document(s)"
                             icon="terp-personal"
                             domain="[('user_id','=',uid)]"
                             help="Filter on my documents" />
-                    </field>
+                </filter>
+                <field name="create_uid" position="replace">
+                    <field name="user_id"/>
                     <field name="parent_id" />
                     <field name="index_content"/>
                 </field>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 4541d0189e4..df04f619415 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -43,10 +43,10 @@
                 <search string="All users files">
                     <group>
                         <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="month"/>
-                            <field name="user"/>
-                            <field name="directory"/>
+                        <field name="name"
+                        filter_domain="['|', '|' ('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
+                        string="Users File"/>
+                        <field name="month"/>
                     </group>
                </search>
             </field>

From e9c9215b5f9224899bbfe220199d230c46a4bdb0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 12:55:18 +0530
Subject: [PATCH 121/161] [IMP] document_webdav : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615072518-j88i71f0xp4uww0g
---
 addons/document_webdav/webdav_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index b0101c01574..7210d5d7d9f 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,8 +38,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
@@ -139,8 +140,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document Property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>

From ac2bd8624ccc2ed6a89e119ba5591588fc1f705b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Jun 2012 18:42:31 +0530
Subject: [PATCH 122/161] [IMP]event_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120615131231-p2jxm11m2nr1beb3
---
 addons/event/event_view.xml                   | 32 +++++++--------
 .../report/report_event_registration_view.xml | 41 +++++++++----------
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 01b41833a65..1714cf32cf8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,21 +265,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
+                        <field name="name" string="Events" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Upcoming"
-                                name="upcoming"
-                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Upcoming events from today" />
-                        <field name="name"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <filter icon="terp-go-today" string="Upcoming"
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Upcoming events from today" />
+                        <separator orientation="vertical"/>
+                        <field name="type" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
             <field name="arch" type="xml">
                 <tree string="Registration" >
                     <field name="create_date"/>
+                    <field name="partner_id"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
@@ -448,19 +449,18 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self), ('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
-                        <field name="user_id">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="origin"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 89ba191dab6..7ae6c0fae2e 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,27 +53,21 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter icon="terp-document-new"
-                        string="New"
-                        domain="[('event_state','=','draft')]"
-                        help="Events which are in New state"/>
-                    <filter icon="terp-check"
-                        string="Confirm"
-                        domain="[('event_state','=','confirm')]"
-                        help="Events which are in confirm state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                          string="Confirmed Registrations"
-                          help="Registrations in confirmed or done state"
-                          context="{'no_of_draft_invisible':1}"/>
-                    <separator orientation="vertical"/>
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="New"
+                            domain="[('event_state','=','draft')]"
+                            help="Events which are in New state"/>
+                        <filter icon="terp-check"
+                            string="Confirm"
+                            domain="[('event_state','=','confirm')]"
+                            help="Events which are in confirm state"/>
                         <filter icon="terp-personal"
-                        string="My Events"
-                        help="My Events"
-                        domain="[('user_id','=',uid)]"/>
-                    </field>
+                            string="My Events"
+                            help="My Events"
+                            domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" string="Event"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -81,7 +75,6 @@
                         <field name="event_date"/>
                     </group>
                     <newline/>
-
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -103,6 +96,12 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
+                    <group expand="0" string="Display">
+                        <filter icon="terp-camera_test"
+                              string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state"
+                              context="{'no_of_draft_invisible':1}"/>
+                    </group>
                 </search>
             </field>
         </record>

From 7e1bbf696e4209760af57da900fd97063ede14f5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 10:23:41 +0530
Subject: [PATCH 123/161] [IMP] email_template : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618045341-dadyvs5qx233rye7
---
 addons/email_template/email_template_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 1403721af53..213e6a78943 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -126,13 +126,10 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name"/>
+                        <field name="name"
+                        filter_domain="['|', '|', '|', '|' ('name','ilike',self), ('lang','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]"
+                        string="Templates"/>
                         <field name="model_id"/>
-                        <field name="email_to"/>
-                        <separator orientation="vertical"/>
-                        <field name="lang"/>
-                        <field name="subject"/>
-                        <field name="report_name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">

From dc194b1ab53e49310e2f6d23caecceb51064a0ef Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 10:59:01 +0530
Subject: [PATCH 124/161] [IMP] fetchmail : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618052901-3jz8v48ydylru451
---
 addons/fetchmail/fetchmail_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d19fb4c4ca1..c990fd5f7a8 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -77,12 +77,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
+                    <field name="name"
+                    filter_domain="[('name','ilike',self)]"
+                    string="Incoming Mail Server"/>
+                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>

From c30cc74bcf0926c5a27fe44b840ac2c815a298b5 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Jun 2012 11:19:35 +0530
Subject: [PATCH 125/161] [IMP]purchase_* : improve filter_domain

bzr revid: cha@tinyerp.com-20120618054935-87rbozf518wslmyb
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3b064060432..974cabb0585 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,7 +65,7 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <group col="8" colspan="4">
-                        <field name="name" string="Picking to Invoice" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                        <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available"
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>

From 81cc6f45cd36a776b7bb92d0a6190838f5767e8b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:26:24 +0530
Subject: [PATCH 126/161] [IMP] launch : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618055624-ckyuicdch6mujg7o
---
 addons/lunch/lunch_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8e449b58e24..37069007638 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -71,11 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
                     <separator orientation="vertical"/>
                     <field name="user_id"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
@@ -181,8 +182,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
-                    <field name="user_cashmove"/>
                     <field name="create_date"/>
+                    <field name="user_cashmove"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
@@ -192,7 +193,6 @@
                         <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
-
             </field>
         </record>
 
@@ -290,7 +290,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
-                    <field name="name" />
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Product"/>
                     <field name="category_id"/>
                     <field name="price"/>
                 </search>
@@ -364,10 +364,10 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
+                        <field name="date"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 4bb2af1475109856068f35e75dde9eb01c534537 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:52:52 +0530
Subject: [PATCH 127/161] [IMP] audittrail : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618062252-h1ju1p1f0k3olnri
---
 addons/audittrail/audittrail_view.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 5f8e2392842..507809d10d4 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -62,9 +62,7 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                     <group>
-                        <field name="name"
-                        filter_domain="[('name','ilike',self)]"
-                        string="Audittrail Rule"/>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Audittrail Rule"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                         <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
@@ -170,9 +168,7 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
                     <group>
-                        <field name="name"
-                        filter_domain="[('name','ilike',self)]"
-                        string="Audittrail Log"/>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Audittrail Log"/>
                         <field name="object_id"/>
                         <field name="user_id"  widget="selection"/>
                     </group>

From 3019c4efd45ac240fbf08712c079dcca697549f3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:55:40 +0530
Subject: [PATCH 128/161] [IMP] base : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618062540-wlalcz7mr9rirkp5
---
 addons/base_calendar/base_calendar_view.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a20e61e5245..a856d6e718c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,9 +94,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <field name="email"
-                   filter_domain="[('email','ilike',self)]"
-                   string="Email"/>
+                   <field name="email" filter_domain="[('email','ilike',self)]" string="Email"/>
                    <field name="event_date"/>
                    <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
@@ -438,9 +436,7 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
-                           <field name="name"
-                           filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]"
-                           string="Event"/>
+                           <field name="name" filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]" string="Event"/>
                            <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"

From 8ed9a3c14ead7b7ee67984a0683a29f896b01c1c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:57:12 +0530
Subject: [PATCH 129/161] [IMP] board : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618062712-kdrg0npgggu9j97d
---
 addons/board/board_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 0ce5e2aa2dc..b4c96a9976f 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,9 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name"
-                filter_domain="[('name','ilike',self)]"
-                string="Dashboard"/>
+                <field name="name" filter_domain="[('name','ilike',self)]" string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>

From 837b5920a618a4d29fbdda4c4e2ad2d7639d1658 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:58:43 +0530
Subject: [PATCH 130/161] [IMP] caldav : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618062843-blnv2e6d00qrlmc0
---
 addons/caldav/caldav_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2fed2fa3f98..0f49dfbb39c 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,9 +158,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
-                    <field name="name"
-                    filter_domain="[('name','ilike',self)]"
-                    string="Calendar"/>
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Calendar"/>
                     <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>

From dafb1992d76806e9d172724fd8b5120aaaa1c031 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 12:07:39 +0530
Subject: [PATCH 131/161] [IMP] email_template : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618063739-8lc5v1qtpa0dr6fu
---
 addons/email_template/email_template_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 213e6a78943..40e1d096372 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -126,9 +126,7 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name"
-                        filter_domain="['|', '|', '|', '|' ('name','ilike',self), ('lang','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]"
-                        string="Templates"/>
+                        <field name="name" filter_domain="['|', '|', '|', '|' ('name','ilike',self), ('lang','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>

From cdee75e26193a01754da515caccb5ca78473947e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 12:08:59 +0530
Subject: [PATCH 132/161] [IMP] fetchmail : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618063859-3fg1aejih4c5tvbb
---
 addons/fetchmail/fetchmail_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index c990fd5f7a8..faff48708d6 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -77,9 +77,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
-                    <field name="name"
-                    filter_domain="[('name','ilike',self)]"
-                    string="Incoming Mail Server"/>
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Incoming Mail Server"/>
                     <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>

From 5f6dc27e33205df1cc665ba2194a78f080ea5367 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Jun 2012 12:18:58 +0530
Subject: [PATCH 133/161] [IMP]stock : improve search code in xml

bzr revid: cha@tinyerp.com-20120618064858-psi6okocl87rbdc4
---
 addons/stock/stock_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6d9869fe904..812787da040 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -281,7 +281,7 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" string="Pack" filter_domain="['|'('name','ilike',self),('serial','ilike',self)]"/>
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="date" />
                         <field name="active"/>
@@ -388,7 +388,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
-                        <field name="name" string="Product Lots" filter_domain="['|','|'('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -871,7 +871,7 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
-                        <field name="name" string="Internal Picking List" filter_domain="['|'('name','ilike', self),('origin','ilike',self)]"/>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
@@ -936,6 +936,7 @@
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
@@ -983,7 +984,7 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
-                        <field name="name" string="Picking List" filter_domain="['|'('name','ilike', self),('origin','ilike',self)]"/>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
@@ -1095,7 +1096,7 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
-                        <field name="name" string="Incoming Shipments" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>

From 700f2d219eb44a9a54b4c93d955f9ce3b88f4cbb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 12:20:45 +0530
Subject: [PATCH 134/161] [IMP] mail : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618065045-f7fttuso82gmqs1e
---
 addons/mail/mail_group_view.xml   |  4 ++--
 addons/mail/mail_message_view.xml | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 67b2efc84a0..fd70bedd77c 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -96,8 +96,8 @@
             <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <search string="Search groups">
-                    <field name="name"/>
+                <search string="Search Groups">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1f7ec2297de..9f0977faa25 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -52,9 +52,9 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
-                    <field name="model"/>
+                    <field name="model" filter_domain="[('model','ilike',self)]" string="Message"/>
                     <field name="date"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -164,6 +164,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <field name="email_from" filter_domain="['|', '|' '|' ('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self), ('model','ilike',self)]" string="Email"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
@@ -173,16 +176,10 @@
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="email_from"/>
-                    <field name="email_to"/>
-                    <field name="subject"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
                         <field name="partner_id" string="Partner Name"/>
-                        <field name="model"/>
                         <field name="res_id"/>
                     </group>
                     <newline/>

From 88176945009cabf235f39bdcddc1049392f40783 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 14:03:21 +0530
Subject: [PATCH 135/161] [IMP] marketing_campaign : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618083321-lnjpfwj2xfwuf30i
---
 .../marketing_campaign_view.xml               | 176 +++++++++---------
 .../report/campaign_analysis_view.xml         |   9 +-
 2 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 4e9658d98a4..cbb4233aace 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -81,31 +81,32 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.search</field>
-       <field name="model">marketing.campaign</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Campaigns">
-               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="object_id" string="Resource"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.search</field>
+        <field name="model">marketing.campaign</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Campaigns">
+                <field name="name" filter_domain="[('name','ilike',self)]" string="Campaign"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
+                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">Campaigns</field>
@@ -185,34 +186,35 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.segment.search</field>
-       <field name="model">marketing.campaign.segment</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Segments">
-               <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
-               <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="campaign_id"/>
-               <field name="object_id"/>
-               <field name="date_run"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.segment.search</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Segments">
+                <field name="name" filter_domain="[('name','ilike',self)]" string="Segment"/>
+                <field name="date_run"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">Segments</field>
@@ -382,41 +384,41 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.workitem.search</field>
-       <field name="model">marketing.campaign.workitem</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Marketing Campaign Activities">
-               <group>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="segment_id"/>
-                <field name="date"/>
+    <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.workitem.search</field>
+        <field name="model">marketing.campaign.workitem</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Campaign Activities">
+                <group>
+                    <field name="res_name" filter_domain="[('name','ilike',self)]" string="Marketing Campaign Activity"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="campaign_id"/>
+                    <field name="segment_id"/>
+                    <field name="object_id"/>
+                    <field name="partner_id"/>
+                    <field name="res_id"/>
+                </group>
                 <newline/>
-                <field name="object_id"/>
-                <field name="res_name"/>
-                <field name="res_id"/>
-                <field name="partner_id"/>
-               </group>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">Campaign Followup</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 2a3b8c80d48..730f327408e 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,7 +31,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                   <group>
+                <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
                             domain="[('state','=','todo')]"/>
@@ -47,13 +49,12 @@
                     <field name="segment_id"/>
                     <field name="partner_id"/>
                     <field name="country_id"/>
-                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
+                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>

From 2349b7a6f2613043e1a7d0049514337462584783 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 14:38:24 +0530
Subject: [PATCH 136/161] [IMP] membership : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618090824-uc2mggpi6tee059v
---
 addons/membership/membership_view.xml         | 62 +++++++++----------
 .../report/report_membership_view.xml         |  4 +-
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 58672e9a6cc..d539eccce7b 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
-                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="code"/>
-                   <field name="name"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group  expand='0' string='Group by...'>
-                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
-                       <separator orientation="vertical"/>
-                       <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
-                   </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Membership Product"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="categ_id" widget="selection" operator="child_of"/>
+                    <newline/>
+                    <group  expand='0' string='Group by...'>
+                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -162,26 +162,26 @@
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Membership Partners">
-		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-	          		<separator orientation="vertical"/>
-		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-	          		<separator orientation="vertical"/>
-	                <field name="membership_stop" string="End Membership Date"/>
-	                <field name="membership_start" invisible="1"/>
-	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="8">
-	                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-	              		<separator orientation="vertical"/>
-	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-	                	<separator orientation="vertical"/>
-	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	            	</group>
-	           </search>
+                <search string="Membership Partners">
+                    <field name="membership_start" invisible="1"/>
+                    <field name="membership_stop" string="End Membership Date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                    <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="10" col="8">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index ff04354c7ae..94790e47021 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,13 +36,15 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
                         <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
-                        <field name="date_from"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">

From 0d06cd0235cdce3e83f9b94225d62cb1794c16fd Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Jun 2012 14:45:02 +0530
Subject: [PATCH 137/161] [IMP]mrp : improve search code in xml

bzr revid: cha@tinyerp.com-20120618091502-kblo7qm9y5nebjhp
---
 addons/mrp/mrp_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index acc4002289f..a7eb2009295 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -189,7 +189,7 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group>
-                        <field name="name" string="mrp workcenter" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                        <field name="name" string="mrp workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
@@ -288,7 +288,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
-                    <field name="name" string="Routing" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                     <separator orientation="vertical"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <separator orientation="vertical"/>
@@ -388,7 +388,7 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group>
-                         <field name="name" string="Bill Of Material" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                         <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                          <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
@@ -775,7 +775,7 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group>
-                       <field name="name" string="Production" filter_domain="['|'('name','ilike',self),('origin','ilike',self)]"/>
+                       <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"

From 1551b1e59aa33f02cd6d4170d5f8e5eb74a9b7ca Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 18 Jun 2012 15:03:57 +0530
Subject: [PATCH 138/161] [IMP]sale_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120618093357-akc9497ojot04qsg
---
 addons/sale/report/sale_report_view.xml | 73 ++++++++++++-------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 9cb332d69e2..6f37a9f729d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,56 +50,53 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Analysis">
-                <group>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
                         domain="[('state','=','draft')]"/>
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
+                    <filter icon="terp-personal"
+                        string="My Sales"
+                        help="My Sales"
+                        domain="[('user_id','=',uid)]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended Filters...">
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
-                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
-                   <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
-                   <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
-                </group>
+                    <field name="user_id"/>
+                   <newline/>
+                   <group expand="0" string="Extended Filters...">
+                       <field name="shop_id" widget="selection"/>
+                       <field name="categ_id" widget="selection"/>
+                       <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                   <newline/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
+                       <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                       <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                       <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
+                       <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
+                       <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                       <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                       <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                       <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                       <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
+                       <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
+                       <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
+                    </group>
             </search>
         </field>
     </record>

From 2dd01eab4f9a40c63fa8801743573ec6767a1bf2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 15:32:39 +0530
Subject: [PATCH 139/161] [IMP] multi_company : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618100239-g1yw6euetfr3qf19
---
 addons/multi_company/res_company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index db0be0d09f4..31617f26bac 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,7 +49,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name"/>
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Multi Company"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>

From cb29e746f3e5e6e617af1aba5ace39152313609f Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 18 Jun 2012 15:33:56 +0530
Subject: [PATCH 140/161] [IMP]sale_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120618100356-sf2uxhikgh218j3g
---
 addons/sale/report/sale_report_view.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 6f37a9f729d..092ef26c125 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,6 +50,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Analysis">
+                <group>
                     <field name="date"/>
                     <field name="date_confirm"/>
                     <separator orientation="vertical"/>
@@ -70,15 +71,15 @@
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="user_id"/>
-                   <newline/>
-                   <group expand="0" string="Extended Filters...">
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters...">
                        <field name="shop_id" widget="selection"/>
                        <field name="categ_id" widget="selection"/>
                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                   <newline/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
                        <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                        <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                        <separator orientation="vertical"/>
@@ -96,7 +97,7 @@
                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
                        <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
-                    </group>
+                  </group>
             </search>
         </field>
     </record>

From 07307dcdde1bc174218b31a2ac0039a83a99bcb3 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Jun 2012 16:30:09 +0530
Subject: [PATCH 141/161] [IMP]process : improve search code in xml

bzr revid: cha@tinyerp.com-20120618110009-ncikr3rb7wb705i5
---
 addons/process/process_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 268820f92d3..292a01a9fb0 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -108,7 +108,8 @@
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Process" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
@@ -205,7 +206,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="ProcessNode" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
@@ -295,7 +297,8 @@
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Transition" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="source_node_id"/>
                     <field name="target_node_id" />
                 </group>

From 665dcdc66106a698d86099b3824b1577fd5e94e1 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Jun 2012 18:30:50 +0530
Subject: [PATCH 142/161] [IMP]procurement : improve search code in xml

bzr revid: cha@tinyerp.com-20120618130050-kvatkti5u0py4bmp
---
 addons/procurement/procurement_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c9a6d55c9d4..8c41d2ef7ff 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -106,17 +106,18 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group>
+                       <field name="origin" string="Procurement" filter_domain="[('origin','ilike',self)]"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_planned"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
                        <separator orientation="vertical"/>
-                       <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
@@ -186,7 +187,8 @@
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Reordering Rules" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>

From ca7d45dc6b124b1ec90e9f3deb275fa5b55b47f5 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 18 Jun 2012 18:54:37 +0530
Subject: [PATCH 143/161] [IMP] project_*: Update search views

bzr revid: psi@tinyerp.com-20120618132437-2yuhcs84vmc768go
---
 addons/project/project_view.xml               | 49 ++++++++---------
 addons/project/report/project_cumulative.xml  | 15 +++---
 addons/project/report/project_report_view.xml | 53 +++++++++----------
 addons/project_gtd/project_gtd_view.xml       | 26 +++------
 addons/project_issue/project_issue_view.xml   | 25 ++++-----
 .../report/project_issue_report_view.xml      | 18 +++----
 .../project_long_term_view.xml                | 29 +++++-----
 .../project_timesheet_view.xml                |  9 ++--
 .../report/task_report_view.xml               | 18 +++----
 9 files changed, 111 insertions(+), 131 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9e2549766f9..cc8edd4084e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,26 +133,23 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                       <field name="complete_name" string="Project Name" filter_domain="[('complete_name','ilike',self)]"/> 
+                       <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template"
-                            name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <separator orientation="vertical"/>
+                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
-                       <separator orientation="vertical"/>
-                       <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager">
-                            <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       </field>
+                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                       <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
-                         <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                    </group>
+                   <group expand="0" string="Group By...">
+                       <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -588,19 +585,19 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <field name="name" string="Tasks" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                            help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id"/>
-                        <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -678,11 +675,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
-                   <group>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    <group>
+                       <field name="name" string="Tasks Stages" filter_domain="[('name','ilike',self)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
-                   </group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index e597928f154..b4bb8f6835b 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,20 +55,19 @@
             <field name="arch" type="xml">
                <search string="Task's Analysis">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="project_id">
-                             <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
-                        <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
-                        <field name="date"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                        <field name="project_id"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index c237ed8854c..c27323d4c3c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -62,6 +62,10 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <group>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="date_deadline"/>
+                        <separator orientation="vertical"/>
                         <filter string="New"
                                 icon="terp-document-new"
                                 domain="[('state','=','draft')]"
@@ -70,32 +74,29 @@
                                 icon="terp-check"
                                 domain="[('state', '=' ,'open')]"
                                 help = "In progress tasks"/>
-                           <filter string="Pending"
-                                   icon="terp-gtk-media-pause"
-                                   domain="[('state','=','pending')]"
-                                   help = "Pending tasks"/>
-                          <filter string="Done"
+                        <filter string="Pending"
+                                icon="terp-gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help = "Pending tasks"/>
+                        <filter string="Done"
                                 icon="terp-dialog-close"
                                 name="done"
                                 domain="[('state','=','done')]"/>
-                       <separator orientation="vertical"/>
-                        <field name="project_id">
-                            <filter icon="terp-folder-violet"
-                                    string="My Projects"
-                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                          </field>
-
-                          <field name="user_id" widget="selection">
-                            <filter icon="terp-personal"
-                                    string="My Task"
-                                    help = "My tasks"
-                                    domain="[('user_id','=',uid)]" />
-                            <filter icon="terp-personal-"
-                                    string="Non Assigned Tasks to users"
-                                    help="Non Assigned Tasks to users"
-                                    domain="[('user_id','=',False)]"/>
-                          </field>
-                      <field name="partner_id" />
+                        <filter icon="terp-folder-violet"
+                                string="My Projects"
+                                help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                                string="My Task"
+                                help = "My tasks"
+                                domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-personal-"
+                                string="Non Assigned Tasks to users"
+                                help="Non Assigned Tasks to users"
+                                domain="[('user_id','=',False)]"/>
+                         <separator orientation="vertical"/>
+                         <field name="project_id"/>
+                         <field name="user_id" widget="selection"/>
+                         <field name="partner_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -103,12 +104,6 @@
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index c8e87093c0e..31bde5d18b0 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -111,26 +111,16 @@
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
+                <field name="name" string="My Tasks" filter_domain="[('name','ilike',self)]"/>
+                <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                <separator orientation="vertical"/>
-                <filter
-                    domain="[('timebox_id','=', False)]"
-                    help="Tasks having no timebox assigned yet" string="Inbox"/>
-                <separator orientation="vertical"/>
-                <separator name="gtdsep"/>
-                <field name="name"/>
-                <field name="context_id" widget="selection"
-                    context="{'context_show': True}">
-                    <filter string="Show Context"
-                        name="context_show"
-                        context="{'context_show': True}"
-                        domain="[]" icon="terp-camera_test"
-                        help="Show the context field"/>
-                    <filter string="Show Deadlines" context="{'deadline_visible': False}"
-                        domain="[]" help="Show only tasks having a deadline"
-                        icon="terp-gnome-cpu-frequency-applet+"/>
-                </field>
+                <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+                <field name="context_id" widget="selection" context="{'context_show': True}"/>
+                <group expand="0" string="Display">
+                    <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
+                    <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ee5d7926d95..d553fcbf129 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -10,7 +10,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
-                    <field name="name"/>
+                    <field name="name" string="Issue Version" filter_domain="[('name','ilike',self)]"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -152,15 +152,16 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
+                        <field name="name" string="Issue / Partner" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                         <separator orientation="vertical"/>
-                        <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
-                        <field name="user_id">
-                            <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                         <field name="project_id"/>
+                        <separator orientation="vertical"/>
                         <field name="id"/>
                     </group>
                     <newline/>
@@ -304,17 +305,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
-                    <separator orientation="vertical"/>
                     <group>
-                        <field name="name" string="Feature description"/>
-                        <field name="user_id"/>
-                        <field name="state" groups="base.group_no_one">
+                        <field name="name" string="Feature description" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id" string="Project"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index bc6a020512d..10d4ccdac34 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,27 +52,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
+                   <group>
+                        <field name="creation_date"/>
+                        <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
                             string="New"
                             domain="[('state','=','draft')]"/>
                         <filter  icon="terp-check"
                             string="To Do"
-                            domain="[('state','=','open')]"/>                            
-                       <filter icon="terp-gtk-media-pause"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                       <filter icon="terp-dialog-close"
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
-                           <separator orientation="vertical" />
-
+                          <separator orientation="vertical" />
                           <field name="project_id"/>
                           <field name="user_id" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
-                          <field name="creation_date"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
@@ -108,8 +107,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
-
-                  </group>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 541738ed69d..3286e9a4c3d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
+                       <field name="user_id"/>
+                       <field name="phase_id"/>
+                       <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -272,18 +272,19 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
+                        <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+                        <field name="project_id"/>
                     </group>
-                    <newline/>
+                    <newline/> 
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0a485470bc7..61b7a8aa1af 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,8 +70,7 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                   <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
@@ -81,9 +80,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                     <field name="account_id" position="replace">
-                    <field name="account_id" string="Analytic account/project" />
-                </field>
+                 <field name="account_id" position="replace">
+                 <field name="account_id" string="Analytic account/project" />
+                 </field>
             </field>
          </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 6d430347c01..58784bdddb1 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -29,20 +29,20 @@
             <field name="model">report.timesheet.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks by User">
-            		<group>
+                <search string="Tasks by User">
+                    <group>
+                        <field name="name" string="Date" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
 	                    <field name="user_id"/>
-	                    <field name="name"/>
-                	</group>
-                	<newline/>
-                	<group expand="1" string="Group By...">
-                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
-            	</search>
+                </search>
             </field>
         </record>
 

From a1ead34ba5167a70e4f6501bd27c7585d4fc2839 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 19 Jun 2012 10:59:37 +0530
Subject: [PATCH 144/161] [IMP] point_of_sale : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120619052937-ndi4f77pxnzpb3zi
---
 .../point_of_sale/account_statement_view.xml  | 10 +++--
 addons/point_of_sale/point_of_sale_view.xml   |  5 ++-
 .../report/pos_order_report_view.xml          | 10 ++---
 .../report/report_cash_register_view.xml      | 44 +++++++++----------
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index e5ade747840..d7941758821 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,10 +27,11 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
@@ -52,11 +53,12 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b832da7ef5b..6f8c0177787 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -138,15 +138,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Sales Order"/>
+                    <field name="date_order"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id"/>
-                    <field name="date_order"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index b3a9990023c..255af0cdd30 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,21 +35,21 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
                         <filter icon="terp-dolar"
                             string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
-                    <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 3cbc315ce0f..fb25e4e4487 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -21,40 +21,40 @@
         </record>
 
         <record id="view_report_cash_register_search" model="ir.ui.view">
-          <field name="name">report.cash.register.search</field>
-          <field name="model">report.cash.register</field>
-          <field name="type">search</field>
-          <field name="arch" type="xml">
-              <search string="Point of Sale Cash Register Analysis">
-                <group>
-                    <filter icon="terp-document-new"
-                        string="Draft"
-                        domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
-                          string="Confirm"
-                          domain="[('state','=',('confirm'))]"/>
+            <field name="name">report.cash.register.search</field>
+            <field name="model">report.cash.register</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Point of Sale Cash Register Analysis">
+                    <group>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="Draft"
+                            domain="[('state','=',('draft'))]"/>
+                        <filter icon="terp-camera_test"
+                            string="Confirm"
+                            domain="[('state','=',('confirm'))]"/>
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
-                  <group expand="1" string="Group By...">
-                      <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                      <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
-                  </group>
-              </search>
-          </field>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record id="action_report_cash_register_all" model="ir.actions.act_window">

From 9552c958b0838085682a921064aaff771fa9e637 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 19 Jun 2012 11:24:23 +0530
Subject: [PATCH 145/161] [IMP]resource : improve search code in xml

bzr revid: cha@tinyerp.com-20120619055423-cvie9crywtzy41sv
---
 addons/resource/resource_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4da1a465c42..28eec61044d 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,12 +11,13 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group>
+                       <field name="name" string="Resource" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="user_id" string="User"/>
-                       <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -39,7 +40,8 @@
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <group>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Name" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -54,7 +56,8 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
                    <group>
-                       <field name="name" string="Reason"/>
+                       <field name="name" string="Reason" filter_domain="[('name','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>

From 682738f93c1a198d39fc9ff5008249e24226f7e9 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 19 Jun 2012 11:26:24 +0530
Subject: [PATCH 146/161] [IMP] report_intrastat : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120619055624-wdoyhvpj6780opr1
---
 addons/report_intrastat/report_intrastat_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 51354b9aa09..c481296196c 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,10 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group>
-                        <field name="name"/>
-                        <field name="month"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
                         <field name="intrastat_id"/>
+                        <field name="month"/>
                         <field name="type"/>
                     </group>
                 </search>

From a6bbbbfea33b2f126ca8ab9fa2aa40b1b2c790cf Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 19 Jun 2012 11:56:25 +0530
Subject: [PATCH 147/161] [IMP] share : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120619062625-4race6q3rdzcsldx
---
 addons/share/res_users_view.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 52e154c1667..3da6c47dec7 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,11 +7,12 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/field[@name='company_ids']" position="after">
-                    <field name="share">
-                        <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                <xpath expr="//field[@name='name']" position="after">
+                    <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                </xpath>
+                <xpath expr="//field[@name='company_ids']" position="after">
+                    <field name="share"/>
                 </xpath>
             </field>
         </record>
@@ -29,11 +30,12 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name"/>
-                    <field name="share">
-                        <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="share"/>
                 </search>
             </field>
         </record>

From cc617d663feb27a8361bb18ec4e58cc63c2ebec4 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 19 Jun 2012 12:12:51 +0530
Subject: [PATCH 148/161] [IMP]crm_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120619064251-r1oolovp41h6ymw8
---
 addons/crm/crm_lead_view.xml                  |  95 ++++++---------
 addons/crm/crm_meeting_view.xml               | 114 ++++++++----------
 addons/crm/crm_phonecall_view.xml             |  63 +++++-----
 addons/crm/crm_report_view.xml                |   5 +-
 addons/crm/report/crm_lead_report_view.xml    |   6 +-
 .../crm/report/crm_phonecall_report_view.xml  |   5 +-
 addons/crm/res_partner_view.xml               |  23 +---
 addons/crm_claim/crm_claim_view.xml           |   6 +-
 .../report/crm_claim_report_view.xml          |  17 +--
 .../crm_fundraising/crm_fundraising_view.xml  |  11 +-
 .../report/crm_fundraising_report_view.xml    |  19 ++-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |   9 +-
 .../report/crm_helpdesk_report_view.xml       |  19 ++-
 addons/crm_partner_assign/crm_lead_view.xml   |   1 -
 .../report/crm_lead_report_view.xml           |   6 +-
 .../report/crm_partner_report_view.xml        |   2 +-
 16 files changed, 165 insertions(+), 236 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2b7760c1716..7feb379c1a7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name"/>
+                    <field name="name" string="Stage Name" filter_domain="[('name','ilike',self)]"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -53,25 +53,6 @@
         <!--
             LEADS
             -->
-        <act_window
-                id="act_crm_opportunity_crm_phonecall_new"
-                name="Phone calls"
-                groups="base.group_sale_salesman"
-                res_model="crm.phonecall"
-                view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-                domain="[('opportunity_id', '=', active_id)]"
-                view_type="form"/>
-
-        <act_window
-                id="act_crm_opportunity_crm_meeting_new"
-                name="Meetings"
-                res_model="crm.meeting"
-                view_mode="tree,form,calendar"
-                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-                domain="[('opportunity_id', '=', active_id)]"
-                view_type="form"/>
-
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -93,16 +74,6 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <div class="oe_right oe_form_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_crm_opportunity_crm_meeting_new)d"
-                            string="Meetings" />
-
-                        <button type="action"
-                            name="%(act_crm_opportunity_crm_phonecall_new)d"
-                            string="Phone Calls" />
-                    </div>
-
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
@@ -249,9 +220,10 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
                                 <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                 <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -310,6 +282,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <field name="name" string="Lead / Customer"
+                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self),('subjects','ilike',self)]"/>
+                <separator orientation="vertical"/>
+                <field name="create_date"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
@@ -322,8 +299,6 @@
                     string="Pending"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
                 <filter string="Unassigned Leads"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
@@ -334,23 +309,11 @@
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="Leads that are assigned to one of the sale teams I manage, or to me"/>
                 <separator orientation="vertical"/>
-                <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id"/>
-                <field name="subjects"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
-                <field name="country_id" context="{'invisible_country': False}">
-                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                </field>
-                <field name="create_date"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -368,6 +331,15 @@
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
+                <separator orientation="vertical"/>
+                <group string="Display">
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>           
            </search>
         </field>
     </record>
@@ -386,10 +358,6 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -402,6 +370,10 @@
                             states="done,cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
@@ -560,6 +532,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
                     name="new"
@@ -572,7 +547,6 @@
                     string="Pending"  help="Pending Opportunities"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
                 <filter string="Unassigned Opportunities"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
@@ -582,20 +556,12 @@
                         context="{'invisible_section': False}"
                         help="Opportunities that are assigned to either me or one of the sale teams I manage" />
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                 <field name="user_id"/>
                 <field name="country"/>
                 <field name="partner_id"/>
                 <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
-                <newline/>
+                    context="{'invisible_section': False, 'default_section_id': self}"/>
+                <separator orientation="vertical"/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -611,6 +577,13 @@
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
+                <group string="Display">
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 962216a222f..3784c81e353 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,62 +38,52 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
-                            <label for="name" string="Title"/> 
-                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
-                            <label for="allday" string="All Day?"/>)
-                        </div>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                        <h2>
-                            At <field name="location" class="oe_form_inline" />
-                        </h2>
-                    </div>
-                    <h2>
-                        <label for="duration" string="Duration" />
-                        <field name="duration" widget="float_time"
-                            on_change="onchange_dates(date,duration,False,allday)"
-                            class="oe_form_inline"/> from
-                        <field name="date"
-                            string="Start Date" 
-                            required="1"
-                            class="oe_form_readonly_hidden oe_form_inline"/> to
-                        <field name="date_deadline" 
-                            string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)"                            
-                            class="oe_form_inline"/> 
-                    </h2>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="organizer"/>
-                        <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
+                <group col="6" colspan="4">
+                    <field name="name" string="Title"
+                           required="1" />
+                    <field name="categ_id" widget="selection"
+                        string="Meeting Type"
+                        domain="[('object_id.model', '=', 'crm.meeting')]" />
+                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
+                    <newline/>
+                    <field name="date" string="Start Date" required="1"
+                        on_change="onchange_dates(date,duration,False,allday)" />
+                    <field name="duration" widget="float_time"
+                        on_change="onchange_dates(date,duration,False,allday)" />
+                    <field name="date_deadline" string="End Date" required="1"
+                        on_change="onchange_dates(date,False,date_deadline)" />
+                    <field name="location" />
+                    <field name="alarm_id" string="Reminder"
+                        widget="selection" />
+                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                           <field name="recurrency" string="Recurrence"/>
                     </group>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
+                <page string="Meeting">
+                    <group col="6" colspan="4">
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Assignment"/>
+                            <field name="user_id" />
+                            <field name="organizer"/>
+                            <field name="section_id" widget="selection"/>
+                        </group><group col="2" colspan="2">
+                            <separator colspan="2" string="Contacts"/>
+                            <field name="partner_id" string="Partner"
+                                on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
+                        </group><group col="2" colspan="2">
+                            <separator colspan="2" string="Visibility"/>
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show Time as"/>
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                    </group>
+                    <separator string="Description" colspan="4" />
+                    <field name="description" nolabel="1" colspan="4" />
+                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -167,11 +157,12 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
+                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -218,9 +209,9 @@
                     </page>
                 </notebook>
                 </sheet>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                <div class="oe_form_bottom">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>
@@ -284,13 +275,14 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
+                           <field name="name" string="Meeting / Partner"
+                               filter_domain="['|', ('name','ilike',self)]"/>
+                           <separator orientation="vertical"/>                   
                            <filter string="My Meetings"
                                    icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           <separator orientation="vertical"/>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <separator orientation="vertical"/>   
                            <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
@@ -306,7 +298,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="ref" position="after">
+                    <field name="language" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f3dff746cf2..77f46c48cbd 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,48 +65,50 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending"/>
+                        states="draft,pending" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending"/>
+                        states="open,pending" icon="gtk-jump-to"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel"/>
+                        states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending"/>
+                        states="draft,open,pending" icon="gtk-cancel"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    type="action"
+                    icon="gtk-index" type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
+                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
-                  <div class="oe_form_title">
-                      <div class="oe_form_readonly_hidden">
-                          <label for="name" string="Title"/> 
-                      </div>
-                      <h1><field name="name" required="1"/></h1>
-                      <div class="oe_form_readonly_hidden">
-                        <label for="partner_phone" string="Phone" />
-                      </div>
-                      <h2><field name="partner_phone"/></h2>
-                  </div>
                  <group col="4">
-                    <field name="date" />
-                    <field name="user_id" />
-                    <field name="duration" widget="float_time" />
+                    <field name="name" required="1"/>
+                    <field name="partner_phone"/>
+                    <field name="duration" widget="float_time"/>
+
+                    <field name="date"/>
+                    <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile" />
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
                 </group>
 
-                <field name="description" placeholder="Description..." />
+                <group>
+                    <group string="Contacts">
+                        <field name="partner_id"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_mobile"/>
+                    </group>
+                    <group string="Categorization">
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
+                </group>
+                <separator string="Description"/>
+                <field name="description"/>
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
@@ -177,8 +179,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <field name="name" string="Phonecalls" filter_domain="[('name','ilike',self)]"/>
                <separator orientation="vertical"/>
+               <field name="date"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
               <filter string="Unassigned Phonecalls"
                        icon="terp-personal-"
                        domain="[('user_id','=',False)]"
@@ -188,13 +193,11 @@
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="Phone Calls that are assigned to me or to my team(s)" />
                <separator orientation="vertical"/>
-               <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id"
                    widget="selection" string="Sales Team"/>
-               <field name="date"/>
-               <newline/>
+               <separator orientation="vertical"/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index aaad73af29a..47c9b5364d6 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -157,9 +157,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                        <field name="name"/>
-                        <field name="month"/>
+                        <field name="name" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="section_id" widget="selection"/>
+                        <field name="month"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index dc23c256f2f..7d6c5922d3b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -82,7 +82,6 @@
                             name="opportunity"
                             domain="[('type','=','opportunity')]"
                             help="Show only opportunity"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="New"
                             domain="[('state','=','draft')]"
@@ -99,7 +98,6 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
@@ -110,7 +108,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical" />
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -125,7 +123,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical" />
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index cd54f8e4e37..ce7f0ac4124 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,7 +64,6 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
@@ -76,7 +75,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -86,7 +85,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 54685a87c48..80daa7bb832 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,7 +39,7 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
-                    <xpath expr="//filter[@string='Company']" position="after">
+                    <xpath expr="//field[@name='user_id']" position="after">
                         <field name="country_id"/>
                     </xpath>
                 </field>
@@ -85,27 +85,6 @@
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="res_partner_view_buttons">
-            <field name="name">res.partner.view.buttons</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action"
-                        string="Schedule a Meeting"
-                        name="%(crm.crm_case_categ_meet_create_partner)d"
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
-                    <button type="action" string="Schedule a Call" 
-                        name="%(crm.crm_case_categ_phone_create_partner)d" 
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
-                    <button type="action" string="Create an Opportunity"
-                        name="%(crm.action_view_crm_partner2opportunity)d" />
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 224446672e7..dc7653861d8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -196,6 +196,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
+                    <field name="name" string="Claims" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
                         help="New Claims" />
@@ -209,16 +211,14 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
-                    <separator orientation="vertical"/>
                     <filter string="Unassigned Claims"
                             icon="terp-personal-"
                             domain="[('user_id','=', False)]"
                             help="Unassigned Claims" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index eefc534fc0e..9d99d72ec69 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -63,29 +63,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-
                             <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-
-                        <field name="user_id" string="Salesperson">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 7d515650944..7959d5a40c0 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,6 +163,8 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
+                            <field name="name" string="Fund Description" filter_domain="[('name','ilike',self)]"/>
+                            <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
                                 help="New Funds" />
@@ -173,7 +175,6 @@
                                 string="Pending"
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
-                            <separator orientation="vertical" />
                             <filter string="Unassigned"
                                     icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
@@ -184,13 +185,11 @@
                                     help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
                             <separator orientation="vertical" />
                             <field name="state"/>
-                            <field name="name"
-                                string="Fund Description" />
-                            <field name="user_id"
+                            <field name="user_id" 
                                 widget="selection"/>
                             <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
-                        <newline/>
+                        <separator orientation="vertical" />
                         <group expand="0" string="Group By...">
                             <filter string="Partner" icon="terp-partner"
                                 domain="[]"
@@ -198,14 +197,12 @@
                             <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Category" help="Fund Category"
                                 icon="terp-stock_symbol-selection" domain="[]"
                                 context="{'group_by':'categ_id'}" />
                             <filter string="Payment Mode" help="Payment Mode"
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index d33d3f0d05d..e0d206b615d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -87,27 +87,24 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
                             <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group  expand="0" string="Extended Filters...">
                         <filter icon="terp-dialog-close"
                             string="Done"
@@ -119,7 +116,7 @@
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 811e5a1cc90..75ac113d26a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -149,6 +149,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <field name="name" string="Query" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
@@ -163,18 +167,15 @@
                         domain="[('state','=','pending')]"
                         help="All pending Helpdesk Request"
                     />
-                    <separator orientation="vertical"/>
                     <filter string="Assigned to Me or My Sales Team(s)"
                             icon="terp-personal+"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <separator orientation="vertical"/>
-                    <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team"/>
-                    <field name="date"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index f1d111747f0..9cceffbe15a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -60,27 +60,24 @@
                         domain="[('state','=','open')]" />
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                             <filter string="My Sales Team(s)"
                             icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
                             <filter string="My Company"
                             icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>   
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
@@ -88,7 +85,7 @@
                         <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 83f0e470c55..1e4908ba4d3 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -62,7 +62,6 @@
                 </filter>
 
                 <field name="user_id" position="after">
-                    <separator orientation="vertical"/>
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a34a9139c3c..736cb3fab85 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -16,7 +16,7 @@
                         <filter icon="terp-dialog-close"
                             string="Closed"
                             domain="[('state','=','done')]"/>
-                        <separator orientation="vertical" />
+                        <separator orientation="vertical"/>
                         <field name="section_id"
                             widget="selection"
                             context="{'invisible_section': False}"/>
@@ -24,7 +24,7 @@
                         <field name="user_id"/>
                         <field name="partner_assigned_id"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical"/>
                    <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
@@ -37,7 +37,7 @@
                       <field name="opening_date"/>
                       <field name="date_closed"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical"/>
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index d652848f0fe..3777b424ca5 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -15,7 +15,7 @@
                         <field name="grade_id"/>
                         <field name="activation"/>
                    </group>
-                   <newline/>
+                   <separator orientation="vertical" />
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />

From 2f826d6cbaf713d1300d0b02f9f1e481b733ca56 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 19 Jun 2012 14:46:20 +0530
Subject: [PATCH 149/161] [IMP]crm_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120619091620-vq00fp13dl02sruj
---
 addons/crm/crm_lead_view.xml                                  | 3 ++-
 addons/crm/crm_phonecall_view.xml                             | 2 +-
 addons/crm/report/crm_lead_report_view.xml                    | 4 ++--
 addons/crm/report/crm_phonecall_report_view.xml               | 4 ++--
 addons/crm_claim/crm_claim_view.xml                           | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml               | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml                     | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 4 ++--
 addons/crm_partner_assign/report/crm_lead_report_view.xml     | 4 ++--
 addons/crm_partner_assign/report/crm_partner_report_view.xml  | 2 +-
 11 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7feb379c1a7..b3a3dab3d21 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -314,6 +314,7 @@
                     context="{'invisible_section': False}"/>
                 <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
+                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -561,7 +562,7 @@
                 <field name="partner_id"/>
                 <field name="section_id"
                     context="{'invisible_section': False, 'default_section_id': self}"/>
-                <separator orientation="vertical"/>
+                <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 77f46c48cbd..85c6d3cb173 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -197,7 +197,7 @@
                <field name="user_id"/>
                <field name="section_id"
                    widget="selection" string="Sales Team"/>
-               <separator orientation="vertical"/>
+               <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 7d6c5922d3b..48d356a2b27 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -108,7 +108,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <separator orientation="vertical" />
+                    <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -123,7 +123,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <separator orientation="vertical" />
+                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ce7f0ac4124..3f28fb8730e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -75,7 +75,7 @@
                             context="{'invisible_section': False}"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
@@ -85,7 +85,7 @@
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index dc7653861d8..b16b2c263b0 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -218,7 +218,7 @@
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 7959d5a40c0..551c2393351 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -189,7 +189,7 @@
                                 widget="selection"/>
                             <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
-                        <separator orientation="vertical" />
+                        <newline/>
                         <group expand="0" string="Group By...">
                             <filter string="Partner" icon="terp-partner"
                                 domain="[]"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index e0d206b615d..fe7ccc9f013 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -104,7 +104,7 @@
                         <field name="company_id" groups="base.group_multi_company"/>
                         <field name="user_id" string="Salesperson"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group  expand="0" string="Extended Filters...">
                         <filter icon="terp-dialog-close"
                             string="Done"
@@ -116,7 +116,7 @@
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 75ac113d26a..16794eb32d2 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -175,7 +175,7 @@
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
                     <field name="section_id" widget="selection" string="Sales Team"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9cceffbe15a..14e110ca5d8 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -77,7 +77,7 @@
                             context="{'invisible_section': False}"/>   
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
@@ -85,7 +85,7 @@
                         <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 736cb3fab85..9857bac5767 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -24,7 +24,7 @@
                         <field name="user_id"/>
                         <field name="partner_assigned_id"/>
                    </group>
-                   <separator orientation="vertical"/>
+                   <newline/>
                    <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
@@ -37,7 +37,7 @@
                       <field name="opening_date"/>
                       <field name="date_closed"/>
                    </group>
-                   <separator orientation="vertical"/>
+                   <newline/>
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 3777b424ca5..d652848f0fe 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -15,7 +15,7 @@
                         <field name="grade_id"/>
                         <field name="activation"/>
                    </group>
-                   <separator orientation="vertical" />
+                   <newline/>
                    <group  expand="1" string="Group By...">
                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />

From 5f8ab20c4aa781b3c2a42bd55574acf037ad8f16 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 19 Jun 2012 14:48:34 +0530
Subject: [PATCH 150/161] [IMP]product_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120619091834-rvpoaom4ecgiwive
---
 addons/product/pricelist_view.xml | 5 +++--
 addons/product/product_view.xml   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f8a3e9ef5f9..403dc8378a2 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -112,9 +112,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
-                    <field name="name" />
-                    <field name="type"/>
+                    <field name="name" string="Products Price" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="currency_id"/>
+                    <field name="type"/>
                     <field name="active" />
                 </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a479e9a72e1..adf0ce79abf 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,14 +9,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
+                   <field name="name" string="Product" filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
-                   <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
-                   <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
                    <group expand="0" string="Context...">
@@ -300,8 +299,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
+                    <field name="name" string="Product Categories" filter_domain="[('name','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="parent_id"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>

From 03ca5f64fb97fb7a8f9350a7b81286d90228c2b5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 19 Jun 2012 14:49:13 +0530
Subject: [PATCH 151/161] [IMP] wiki : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120619091913-pcc35l3t08vsmifu
---
 addons/wiki/wiki_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1dc8b4cdb1f..d868b5ff737 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -164,14 +164,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
+                        string="Wiki"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="group_id"/>
-                    <field name="tags"/>
-                    <field name="section"/>
                     <field name="write_uid"/>
-                    <field name="write_date" groups="base.group_no_one"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>

From 0428090aada86d3aaeaa0f406075dcbfe861d0e4 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 19 Jun 2012 15:36:23 +0530
Subject: [PATCH 152/161] [IMP]crm_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120619100623-to2h8s7kn5hm9kro
---
 addons/crm/crm_lead_view.xml    | 2 +-
 addons/crm/crm_meeting_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b3a3dab3d21..19bc07bc516 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -283,7 +283,7 @@
         <field name="arch" type="xml">
             <search string="Search Leads">
                 <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self),('subjects','ilike',self)]"/>
+                    filter_domain="['|','|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self),('subjects','ilike',self)]"/>
                 <separator orientation="vertical"/>
                 <field name="create_date"/>
                 <separator orientation="vertical"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 3784c81e353..c510c9601f3 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -276,7 +276,7 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self)]"/>
+                               filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
                            <separator orientation="vertical"/>                   
                            <filter string="My Meetings"
                                    icon="terp-personal"

From 93349b95a7deea5430f56d03de2684f915cff988 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 19 Jun 2012 16:49:16 +0530
Subject: [PATCH 153/161] [IMP]subscription : improve search code in xml

bzr revid: rpr@tinyerp.com-20120619111916-8avmqbjscmkafn9f
---
 addons/subscription/subscription_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index e2960a9edd7..5ad40667d28 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,14 +74,16 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
+                        <field name="name" string="Subscription" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_init"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check"
                         string="Running"
                         domain="[('state','=','running')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="user_id"/>
                         <field name="partner_id"/>
-                        <field name="date_init"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -166,7 +168,8 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Subscription Document" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
                 </search>

From f252be977b3e1d036966610d6c92eaa64bae9d3b Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 19 Jun 2012 16:53:49 +0530
Subject: [PATCH 154/161] [IMP]survey : improve search code in xml

bzr revid: rpr@tinyerp.com-20120619112349-4pedepq2co3wwanm
---
 addons/survey/survey_view.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index cb850d8123f..64786eb9a95 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,14 +258,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="title" string="Survey" filter_domain="[('title','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         <separator orientation="vertical"/>
-                        <field name="title"/>
                         <field name="type" widget="selection"/>
-                        <field name="responsible_id">
-                            <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
-                        </field>
+                        <field name="responsible_id"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -473,7 +473,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title"/>
+                    <field name="title" string="Page" filter_domain="[('title','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -678,7 +679,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question"/>
+                    <field name="question" string="Question" filter_domain="[('question','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
@@ -1100,14 +1102,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="email" string="Survey" filter_domain="[('email','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection"/>
-                        <field name="email"/>
-                        <field name="user_id">
-                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 4f3cdf111c078f96d0b7299a9eaac39302c0dd4c Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 20 Jun 2012 11:19:44 +0530
Subject: [PATCH 155/161] [IMP]crm_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120620054944-eu0qc0bi9r37361g
---
 addons/crm/crm_lead_view.xml                    | 5 +++--
 addons/crm/crm_report_view.xml                  | 5 ++---
 addons/crm/report/crm_lead_report_view.xml      | 2 ++
 addons/crm/report/crm_phonecall_report_view.xml | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 19bc07bc516..18a32c7f4c9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -282,8 +282,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self),('subjects','ilike',self)]"/>
+                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <!---TO FIX: when subjects put in domain it not works-->
+                <field name="subjects"/>     
                 <separator orientation="vertical"/>
                 <field name="create_date"/>
                 <separator orientation="vertical"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 47c9b5364d6..aaad73af29a 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -157,10 +157,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="section_id" widget="selection"/>
+                        <field name="name"/>
                         <field name="month"/>
+                        <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 48d356a2b27..dc23c256f2f 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -82,6 +82,7 @@
                             name="opportunity"
                             domain="[('type','=','opportunity')]"
                             help="Show only opportunity"/>
+                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="New"
                             domain="[('state','=','draft')]"
@@ -98,6 +99,7 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
+                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 3f28fb8730e..cd54f8e4e37 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,6 +64,7 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
+                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"

From 4ccafc4c3a0bf04706431da448420ebb31ab2cbf Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 20 Jun 2012 14:14:28 +0530
Subject: [PATCH 156/161] [IMP] misc

bzr revid: psi@tinyerp.com-20120620084428-ltgfaqakh3d7h7sg
---
 addons/hr_payroll/hr_payroll_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 82f8cf77470..b0191a077fb 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -382,7 +382,7 @@
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <group>
-                        <field name="name" string="Payslips" filter_domain="['|'('name','ilike',self),('number','ilike',self)]"/>
+                        <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="date_from"/>
                         <separator orientation="vertical"/>
@@ -464,7 +464,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name" string="Salary Rule Categories" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="name" string="Salary Rule Categories" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                </search>
             </field>
         </record>
@@ -650,7 +650,7 @@
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <group col="8">
-                        <field name="name" string="Salary Rules" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
+                        <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>

From 4dbe82473921a2335dce292f9b70ef2a8bab3858 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 20 Jun 2012 14:50:36 +0530
Subject: [PATCH 157/161] [IMP] hr_attendance: small fix

bzr revid: psi@tinyerp.com-20120620092036-3sqcq8cswvrpbi8x
---
 addons/hr_attendance/hr_attendance_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c86de82ec16..bfe92340b7c 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -54,7 +54,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <field name="name" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />

From ecd59426ae00db603fe8f48d9c4595e7c774731b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 22 Jun 2012 10:05:04 +0200
Subject: [PATCH 158/161] [MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20120622080504-bd0291ildonwdz82
---
 .../report/mail_message_report_view.xml.THIS  | 100 ------------------
 addons/share/res_users_view.xml               |   2 +-
 addons/stock/stock_view.xml                   |  15 +--
 addons/stock_planning/stock_planning_view.xml |   2 +-
 addons/subscription/subscription_view.xml     |   4 +-
 addons/survey/survey_view.xml                 |   8 +-
 6 files changed, 16 insertions(+), 115 deletions(-)
 delete mode 100644 addons/mail/report/mail_message_report_view.xml.THIS

diff --git a/addons/mail/report/mail_message_report_view.xml.THIS b/addons/mail/report/mail_message_report_view.xml.THIS
deleted file mode 100644
index 10c60a30cb0..00000000000
--- a/addons/mail/report/mail_message_report_view.xml.THIS
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Latest Activities -->
-        <record model="ir.actions.act_window" id="action_latest_activities_tree">
-            <field name="name">Latest Activities</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!-- Mail message report search view  -->
-        <record id="view_mail_message_report_filter" model="ir.ui.view">
-            <field name="name">mail.message.report.select</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Mail message Analysis">
-                    <group>
-                        <field name="creation_date"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
-                            <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
-            </field>
-        </record>
-
-        <!-- Mail message report Tree view  -->
-        <record id="view_mail_message_report_tree" model="ir.ui.view">
-            <field name="name">mail.message.report.tree</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            <tree string="Mail message Analysis">
-                <field name="name" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="res_model" invisible="1"/>
-                <field name="nbr" />
-                <field name="creation_date" invisible="1"/>
-             </tree>
-            </field>
-       </record>
-
-        <!-- Monthly Activity per Document -->
-        <record id="board_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Monthly Activity per Document" type="bar">
-                	<field name="res_model"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_monthly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Monthly Activity per Document</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_mail_message_report_graph"></field>
-        </record>
-
-        <!-- Weekly Global Activity -->
-        <record id="board_weekly_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.weekly.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Weekly Global Activity" type="bar">
-                	<field name="day"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_weekly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Weekly Global Activity</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_weekly_mail_message_report_graph"></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3da6c47dec7..1d85857808e 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -30,7 +30,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
+                    <field name="name" string="Group"/>
                     <separator orientation="vertical"/>
                     <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 33343f24fa6..d2a7c2d90b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,7 +78,7 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name" string="Inventory Reference" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Inventory Reference"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -288,6 +288,7 @@
                         <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
@@ -554,7 +555,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
-                    <field name="name" string="Stock Locations" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Locations"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
@@ -1291,8 +1292,8 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
                         <field name="date" groups="base.group_no_one"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
@@ -1478,7 +1479,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <field name="origin" string="Stock Moves"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
@@ -1509,7 +1510,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <field name="origin" string="Stock Moves"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
@@ -1704,7 +1705,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name" string="Stock Journal" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Journal"/>
                     <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 617af7d68a7..60f8127165f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,7 +50,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <field name="name" string="Stock Periods" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Periods"/>
                     <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 90e16a698c2..e02ce3d07dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,7 +74,7 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
-                        <field name="name" string="Subscription" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Subscription"/>
                         <separator orientation="vertical"/>
                         <field name="date_init"/>
                         <separator orientation="vertical"/>
@@ -168,7 +168,7 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name" string="Subscription Document" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Subscription Document"/>
                         <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 6c7a7f4a5e2..c50613f466b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,7 +258,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
-                        <field name="title" string="Survey" filter_domain="[('title','ilike',self)]"/>
+                        <field name="title" string="Survey"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
@@ -473,7 +473,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title" string="Page" filter_domain="[('title','ilike',self)]"/>
+                    <field name="title" string="Page"/>
                     <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
@@ -679,7 +679,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question" string="Question" filter_domain="[('question','ilike',self)]"/>
+                    <field name="question" string="Question"/>
                     <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
@@ -1102,7 +1102,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
-                        <field name="email" string="Survey" filter_domain="[('email','ilike',self)]"/>
+                        <field name="email" string="Survey"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>

From c9ef276770587e6ce8c282fad751ff5565a90004 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 22 Jun 2012 12:29:59 +0200
Subject: [PATCH 159/161] [REF] search views: removed filter_domain if only one
 element was inside + made some small usability changes

bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
---
 addons/account/account_view.xml               | 19 ++++++++++---------
 addons/account/project/project_view.xml       |  2 +-
 .../account_analytic_entries_report_view.xml  |  2 +-
 addons/account/report/account_report_view.xml |  4 ++--
 .../account_analytic_plans_view.xml           |  2 +-
 addons/account_asset/account_asset_view.xml   |  3 ++-
 addons/account_coda/account_coda_view.xml     |  1 -
 .../account_followup_view.xml                 |  2 +-
 .../account_invoice_layout_view.xml           |  2 +-
 .../account_payment/account_payment_view.xml  |  2 --
 .../account_voucher/account_voucher_view.xml  |  2 +-
 .../voucher_payment_receipt_view.xml          |  4 ++--
 .../voucher_sales_purchase_view.xml           |  4 ++--
 addons/audittrail/audittrail_view.xml         |  5 +++--
 addons/base_calendar/base_calendar_view.xml   |  2 +-
 addons/board/board_view.xml                   |  2 +-
 addons/caldav/caldav_view.xml                 |  3 +--
 addons/crm/crm_lead_view.xml                  |  3 ++-
 addons/crm/crm_phonecall_view.xml             |  4 ++--
 addons/crm/crm_report_view.xml                |  4 ++++
 addons/crm/report/crm_lead_report_view.xml    |  1 -
 .../crm/report/crm_phonecall_report_view.xml  |  1 -
 addons/crm_claim/crm_claim_view.xml           |  3 +--
 .../report/crm_claim_report_view.xml          |  6 +++---
 .../crm_fundraising/crm_fundraising_view.xml  |  2 +-
 .../report/crm_fundraising_report_view.xml    |  4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  2 +-
 .../report/crm_helpdesk_report_view.xml       |  4 ++--
 addons/document/document_view.xml             | 11 ++++++-----
 .../document/report/document_report_view.xml  |  2 +-
 addons/email_template/email_template_view.xml |  3 ++-
 addons/event/event_view.xml                   |  2 +-
 addons/fetchmail/fetchmail_view.xml           |  2 +-
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         |  4 ++--
 addons/hr_contract/hr_contract_view.xml       |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml   |  3 ++-
 addons/hr_holidays/hr_holidays_view.xml       |  5 ++---
 addons/hr_payroll/hr_payroll_view.xml         |  6 +++---
 .../hr_payroll_account_view.xml               |  2 +-
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../hr_timesheet_invoice_report_view.xml      |  6 +++---
 .../report/report_analytic_view.xml           |  2 +-
 43 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fdd14d8a4fe..ab46f7519f8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -378,7 +378,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Journal View"/>
+                    <field name="name" string="Journal View"/>
                 </search>
             </field>
         </record>
@@ -520,7 +520,7 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Bank Statement"/>
+                        <field name="name" string="Bank Statement"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -565,7 +565,7 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Bank Statement"/>
+                        <field name="name" string="Bank Statement"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -1619,7 +1619,7 @@
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Journal Entry Model"/>
+                        <field name="name" string="Journal Entry Model"/>
                         <separator orientation="vertical"/>
                         <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
                         <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
@@ -1712,7 +1712,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Payment Term"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -1798,7 +1798,7 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Account Subscription"/>
+                        <field name="name" string="Account Subscription"/>
                         <separator orientation="vertical"/>
                         <field name="date_start"/>
                         <separator orientation="vertical"/>
@@ -2140,7 +2140,7 @@
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Account Template"/>
+                        <field name="name" string="Account Template"/>
                         <separator orientation="vertical"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
@@ -2456,7 +2456,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Fiscal Position Template"/>
+                    <field name="name" string="Fiscal Position Template"/>
                 </search>
             </field>
         </record>
@@ -2746,7 +2746,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Account Report"/>
+                        <field name="name" string="Account Report"/>
+                        <separator orientation="vertical"/>
                         <field name="account_report_id"/>
                         <field name="type"/>
                     </group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3dcb500904..2132eecb463 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -220,7 +220,7 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Analytic Line"/>
+                        <field name="name" string="Analytic Line"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index e6543bd132e..da60b59a8f4 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,7 +35,7 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
                 <group>
-                    <field name="day" filter_domain="[('day','ilike',self)]" string="Day"/>
+                    <field name="day" string="Day"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 9c4b1271162..c9c667ae70e 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -151,7 +151,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Year"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
@@ -214,7 +214,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Year"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 1bca6b341bd..045a0eb0cbb 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -196,7 +196,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Analytic Plan"/>
+                <field name="name" string="Analytic Plan"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 118b12dc81a..9beb0c37d60 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -64,7 +64,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Asset Category"/>
+                <field name="name" string="Asset Category"/>
+                <separator orientation="vertical"/>
                 <field name="journal_id"/>
             </search>
         </field>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 6289270854f..bb2e833ce25 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -391,7 +391,6 @@
             <search string="Search CODA Bank Statements">
                 <group col="8" colspan="4">
                     <field name="name"
-                        filter_domain="[('name','ilike',self)]"
                         string="CODA Bank Statement"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index d5609d85e22..c2e89202553 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -72,7 +72,7 @@
             <field name="arch" type="xml">
                 <search string="Search Followup">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Followup"/>
+                        <field name="name" string="Followup"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 70f690d0b7e..e9789b8199e 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -74,7 +74,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Messages">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Message"/>
+                <field name="name" string="Message"/>
                 <separator orientation="vertical"/>
                 <field name="msg"/>
             </search>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 4ad391520f6..aa4cd18308f 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -48,7 +48,6 @@
             <field name="arch" type="xml">
                 <search string="Payment Mode">
                     <field name="name"
-                        filter_domain="[('name','ilike',self)]"
                         string="Payment Mode"/>
                     <separator orientation="vertical"/>
                     <field name="journal" widget='selection'/>
@@ -212,7 +211,6 @@
                 <search string="Search Payment Orders">
                     <group>
                         <field name="reference"
-                            filter_domain="[('reference','ilike',self)]"
                             string="Payment Order"/>
                         <separator orientation="vertical"/>
                         <field name="date_done"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index cd8116b7ea2..6177da71eed 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -123,7 +123,7 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
-                        <field name="number" filter_domain="[('number','ilike',self)]" string="Voucher"/>
+                        <field name="number" string="Voucher"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b591b557d64..cfed906e431 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
-                        <field name="number" filter_domain="[('number','ilike',self)]" string="Voucher"/>
+                        <field name="number" string="Voucher"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -41,7 +41,7 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
-                        <field name="number" filter_domain="[('number','ilike',self)]" string="Voucher"/>
+                        <field name="number" string="Voucher"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 3c53518e530..5de7636c0c1 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
-                        <field name="number" filter_domain="[('number','ilike',self)]" string="Voucher"/>
+                        <field name="number" string="Voucher"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
-                        <field name="number" filter_domain="[('number','ilike',self)]" string="Voucher"/>
+                        <field name="number" string="Voucher"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index a7bbf1e753a..55c55398f4e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -64,7 +64,7 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Audittrail Rule"/>
+                        <field name="name" string="Audittrail Rule"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                         <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
@@ -172,7 +172,8 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Audittrail Log"/>
+                        <field name="name" string="Audittrail Log"/>
+                        <separator orientation="vertical"/>
                         <field name="object_id"/>
                         <field name="user_id"  widget="selection"/>
                     </group>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 52672f8d5a7..da58c54cd73 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,7 +94,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <field name="email" filter_domain="[('email','ilike',self)]" string="Email"/>
+                   <field name="email" string="Email"/>
                    <separator orientation="vertical"/>
                    <field name="event_date"/>
                    <separator orientation="vertical"/>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index b4c96a9976f..f556b461835 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Dashboard"/>
+                <field name="name" string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 0f49dfbb39c..02025ab5261 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,12 +158,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Calendar"/>
+                    <field name="name" string="Calendar"/>
                     <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
-                    <separator orientation="vertical"/>
                     <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     <separator orientation="vertical"/>
                     <field name="user_id" widget="selection"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a305be19577..4fa4d778082 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name" string="Stage Name" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stage Name"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c8948c31f06..966387608ed 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -177,12 +177,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <field name="name" string="Phonecalls" filter_domain="[('name','ilike',self)]"/>
+               <field name="name" string="Phonecalls"/>
                <separator orientation="vertical"/>
                <field name="date"/>
                <separator orientation="vertical"/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-              <filter string="Unassigned Phonecalls"
+               <filter string="Unassigned Phonecalls"
                        icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index aaad73af29a..2c62ae2ead3 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -71,6 +71,7 @@
                 <search string="Cases by Team and Type">
                     <group>
                         <field name="name"/>
+                        <separator orientation="vertical"/>
                         <field name="month"/>
                         <field name="section_id" widget="selection" />
                         <field name="category2_id"/>
@@ -158,6 +159,7 @@
                 <search string="Cases by Team and Stage">
                    <group>
                         <field name="name"/>
+                        <separator orientation="vertical"/>
                         <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
@@ -229,6 +231,7 @@
                 <search string="Cases by Section, Category and Stage">
                     <group>
                         <field name="name"/>
+                        <separator orientation="vertical"/>
                         <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
@@ -317,6 +320,7 @@
                 <search string="Search Cases by User">
                     <group>
                         <field name="name"/>
+                        <separator orientation="vertical"/>
                         <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index dc23c256f2f..142d44432f0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,7 +99,6 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index cd54f8e4e37..3f28fb8730e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,7 +64,6 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
                         <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b7286275db2..db479343281 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -196,7 +196,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                    <field name="name" string="Claims" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Claims"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
@@ -211,7 +211,6 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
-                    <separator orientation="vertical"/>
                     <filter string="Unassigned Claims"
                             icon="terp-personal-"
                             domain="[('user_id','=', False)]"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 9d99d72ec69..e92102f889d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -63,17 +63,17 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                            <filter string="My Sales Team(s)"
+                        <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                            <filter string="My Company"
+                        <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                         <field name="user_id" string="Salesperson"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index de446ba6fe3..dfe58162d83 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,7 +163,7 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
-                            <field name="name" string="Fund Description" filter_domain="[('name','ilike',self)]"/>
+                            <field name="name" string="Fund Description"/>
                             <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index fe7ccc9f013..5a3ed924567 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -87,12 +87,12 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                            <filter string="My Sales Team(s)"
+                        <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                            <filter string="My Company"
+                        <filter string="My Company"
                                 icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 3ab23c766b8..2a004b32d3e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -149,7 +149,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
-                    <field name="name" string="Query" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Query"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 14e110ca5d8..6060c6c1f90 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -61,12 +61,12 @@
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
                         <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                            <filter string="My Sales Team(s)"
+                        <filter string="My Sales Team(s)"
                             icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                            <filter string="My Company"
+                        <filter string="My Company"
                             icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 221d7d49fcf..da4b6c2284d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -40,7 +40,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Storage">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Document Storage"/>
+                    <field name="name" string="Document Storage"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -171,7 +171,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Document Directory"/>
+                    <field name="name" string="Document Directory"/>
                     <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
@@ -292,11 +292,12 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@string='My Document(s)']" position="replace">
-                    <filter string="My Document(s)"
+                <xpath expr="//filter[@name='my_documents_filter']" position="replace">
+                    <filter name="my_documents_filter" 
+                            string="My Document(s)"
                             icon="terp-personal"
                             domain="[('user_id','=',uid)]"
-                            help="Filter on my documents" />
+                            help="Filter on my documents"/>
                 </xpath>
                 <xpath expr="//field[@name='create_uid']" position="replace">
                     <field name="user_id"/>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index c9eb56927d2..e688707086a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <search string="All users files">
                     <group>
-                        <separator orientation="vertical"/>
                         <field name="name"
                             filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
                             string="Users File"/>
+                        <separator orientation="vertical"/>
                         <field name="month"/>
                     </group>
                </search>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 55e51e185e3..7b64254dfd8 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -128,9 +128,10 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name" filter_domain="['|', '|', '|', '|',('name','ilike',self), ('lang','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
+                        <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
                         <separator orientation="vertical"/>
                         <field name="model_id"/>
+                        <field name="lang"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5ec58e4e60a..ed539e7bf39 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,7 +265,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
-                        <field name="name" string="Events" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Events"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d51ca934329..9567f7746f3 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -79,7 +79,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Incoming Mail Server"/>
+                    <field name="name" string="Incoming Mail Server"/>
                     <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 09f38ceb78a..1935cbbd03d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -41,7 +41,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <field name="name" string="Department" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Department"/>
                     <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0df0a135318..5915511d385 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -105,7 +105,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name" string="Employees" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Employees"/>
                     <separator orientation="vertical"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
@@ -410,7 +410,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <field name="name" string="Job" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Job"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"  
                             domain="[('state','=','open')]" 
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5f71ac9731c..ab93bd9c0c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                       <field name="name" string="Contracts" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Contracts"/>
                        <separator orientation="vertical"/>
                        <field name="date_start"/>
                        <field name="date_end"/>
@@ -163,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                       <field name="name" string="Contract Type" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Contract Type"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index c997d1f753b..90de785a34a 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <group>
-                       <field name="name" string="Appraisal Plans" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Appraisal Plans"/>
                        <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -322,6 +322,7 @@
                 <search string="Search Appraisal">
                    <group>
                         <field name="date_deadline"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 71cdf2179dc..7db5a41b7e8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,7 +12,6 @@
                         <separator orientation="vertical"/>
                         <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                         <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
@@ -353,7 +352,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Leave Types"/>
                     <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
@@ -420,7 +419,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Leave Types"/>
                     <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 2f52ef37c5a..03fd4762262 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -519,7 +519,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
-                    <field name="name" string="Contribution Registers" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Contribution Registers"/>
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </search>
@@ -691,13 +691,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
-                    <field name="name" string="Payslip Batches" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Payslip Batches"/>
                     <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 2b2d3678cbb..e06a43588c4 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -60,7 +60,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
-                <filter icon="terp-camera_test" string="Done" position="after">
+                <filter name='done_filter' position="after">
                     <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
                 </filter>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 39705f02a33..51743733cd5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <group>
-                        <field name="name" string="Type of invoicing" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Type of invoicing"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 5ee5926bf83..0167d4b959e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                        <field name="name" string="Timesheet by users" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Timesheet by users"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="month"/>
@@ -283,7 +283,7 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
-                        <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
@@ -352,7 +352,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
-                        <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 70737793834..f545edcb899 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,7 +114,7 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <field name="name" string="Analytic Lines" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Analytic Lines"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>

From 55633a22a2ed4b5f06eab47429b339770a5d1170 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 22 Jun 2012 16:42:51 +0530
Subject: [PATCH 160/161] [REF] search views: removed filterr_domain if only
 one element was inside

bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
---
 addons/account_asset/account_asset_view.xml               | 2 +-
 addons/hr_attendance/hr_attendance_view.xml               | 2 +-
 addons/hr_expense/hr_expense_view.xml                     | 2 +-
 addons/idea/idea_view.xml                                 | 5 ++---
 addons/lunch/lunch_view.xml                               | 2 +-
 addons/mail/mail_group_view.xml                           | 2 +-
 addons/mail/mail_message_view.xml                         | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml     | 6 +++---
 addons/mrp/mrp_view.xml                                   | 2 +-
 addons/mrp/report/mrp_report_view.xml                     | 2 +-
 addons/mrp_operations/mrp_operations_view.xml             | 2 +-
 addons/mrp_repair/mrp_repair_view.xml                     | 2 +-
 addons/multi_company/res_company_view.xml                 | 2 +-
 addons/point_of_sale/account_statement_view.xml           | 4 ++--
 addons/point_of_sale/point_of_sale_view.xml               | 2 +-
 addons/process/process_view.xml                           | 6 +++---
 addons/procurement/procurement_view.xml                   | 4 ++--
 addons/product/pricelist_view.xml                         | 2 +-
 addons/product/product_view.xml                           | 2 +-
 addons/project/project_view.xml                           | 6 +++---
 addons/project_gtd/project_gtd_view.xml                   | 2 +-
 addons/project_issue/project_issue_view.xml               | 5 +++--
 addons/project_long_term/project_long_term_view.xml       | 2 +-
 addons/project_timesheet/report/task_report_view.xml      | 2 +-
 addons/purchase/purchase_view.xml                         | 4 ++--
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 addons/resource/resource_view.xml                         | 6 +++---
 27 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 9beb0c37d60..8efe929e471 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -205,7 +205,7 @@
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <group col="10" colspan="12">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Asset"/>
+                    <field name="name" string="Asset"/>
                     <separator orientation="vertical"/>
                     <field name="purchase_date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index bfe92340b7c..d3047f424ec 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -54,7 +54,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <field name="name"/>
+                    <field name="name" string="Attendance"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e3aacf29169..6df675552b0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -136,7 +136,7 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <field name="name" string="Expenses" filter_domain="[('name','ilike',self)]"/>
+                      <field name="name" string="Expenses"/>
                       <separator orientation="vertical"/>
                       <field name="date"/>
                       <separator orientation="vertical"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8fe442a24c8..0aabaa42276 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,8 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <field name="name" string="Category" filter_domain="[('name','ilike',self)]"/>
-                <field name="name"/>
+                <field name="name" string="Category"/>
             </search>
         </field>
     </record>
@@ -109,7 +108,7 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group>
-                    <field name="name" string="Idea" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Idea"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 1b5221a33f0..790559ac3bb 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -290,7 +290,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Product"/>
+                    <field name="name" string="Product"/>
                     <field name="category_id"/>
                     <field name="price"/>
                 </search>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 5003adedea8..1c8ab95fafc 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -100,7 +100,7 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <search string="Search Groups">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
+                    <field name="name" string="Group"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index b665ccd95d1..c668bcdfe93 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -54,7 +54,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="model" filter_domain="[('model','ilike',self)]" string="Message"/>
+                    <field name="model" string="Message"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <field name="user_id"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 7ff71175c53..afa785aad5e 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -87,7 +87,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaigns">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Campaign"/>
+                <field name="name" string="Campaign"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
@@ -192,7 +192,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Segments">
-                <field name="name" filter_domain="[('name','ilike',self)]" string="Segment"/>
+                <field name="name" string="Segment"/>
                 <field name="date_run"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
@@ -391,7 +391,7 @@
         <field name="arch" type="xml">
             <search string="Marketing Campaign Activities">
                 <group>
-                    <field name="res_name" filter_domain="[('name','ilike',self)]" string="Marketing Campaign Activity"/>
+                    <field name="res_name" string="Marketing Campaign Activity"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1505a0549ab..080b9ba7e79 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -82,7 +82,7 @@
             <field name="arch" type="xml">
                 <search string="Search">
                    <group>
-                       <field name="name" string="Name" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Name"/>
                        <separator orientation="vertical"/>
                        <field name="group_id"  widget="selection" />
                        <field name="composition"/>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index d00d20fa55f..eef6c89f702 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -36,7 +36,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
-                    <field name="name" string="Week" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Week"/>
                     <separator orientation="vertical"/>
                     <field name="workcenter_id" widget="selection"/>
                 </search>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b8604e003ee..5259d060414 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -125,7 +125,7 @@
             <field name="arch" type="xml">
                 <search string="Search Work Orders">
                     <group>
-                        <field name="name" string="Work Orders" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Work Orders"/>
                         <separator orientation="vertical"/>
                         <field name="date_planned"/>
                         <separator orientation="vertical"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index e9d18d8c281..10c19eb1585 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -191,7 +191,7 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group>
-                       <field name="name" string="Reair Orders" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Reair Orders"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 31617f26bac..22ddec105b0 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,7 +49,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Multi Company"/>
+                    <field name="name" string="Multi Company"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d7941758821..3adfce1c19c 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,7 +27,7 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <field name="name" string="Cash Statement"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
-                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <field name="name" string="Cash Statement"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 394567492d4..e87ff830967 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -138,7 +138,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Sales Order"/>
+                    <field name="name" string="Sales Order"/>
                     <field name="date_order"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index babe9a33cdf..fe88f61bd98 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -110,7 +110,7 @@
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <group>
-                        <field name="name" string="Process" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Process"/>
                         <separator orientation="vertical"/>
                         <field name="model_id"/>
                     </group>
@@ -210,7 +210,7 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <group>
-                    <field name="name" string="Process Node" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Process Node"/>
                     <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="kind" />
@@ -303,7 +303,7 @@
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <group>
-                    <field name="name" string="Process Transition" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Process Transition"/>
                     <separator orientation="vertical"/>
                     <field name="source_node_id"/>
                     <field name="target_node_id"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 8c41d2ef7ff..547cbb64730 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -106,7 +106,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group>
-                       <field name="origin" string="Procurement" filter_domain="[('origin','ilike',self)]"/>
+                       <field name="origin" string="Procurement"/>
                        <separator orientation="vertical"/>
                        <field name="date_planned"/>
                        <separator orientation="vertical"/>
@@ -187,7 +187,7 @@
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <group>
-                        <field name="name" string="Reordering Rules" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Reordering Rules"/>
                         <separator orientation="vertical"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index d44767cbdfd..0492881d9bd 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -112,7 +112,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
-                    <field name="name" string="Products Price" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Products Price"/>
                     <separator orientation="vertical"/>
                     <field name="currency_id"/>
                     <field name="type"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 574787e882b..c8ca653b818 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -299,7 +299,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
-                    <field name="name" string="Product Categories" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Product Categories"/>
                     <separator orientation="vertical"/>
                     <field name="parent_id"/>
                 </search>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b9a8cb1a452..11caec82821 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,7 +133,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
-                       <field name="complete_name" string="Project Name" filter_domain="[('complete_name','ilike',self)]"/> 
+                       <field name="complete_name" string="Project Name"/> 
                        <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
@@ -589,7 +589,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
-                        <field name="name" string="Tasks" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Tasks"/>
                         <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
@@ -680,7 +680,7 @@
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
                     <group>
-                       <field name="name" string="Tasks Stages" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Tasks Stages"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
                     </group>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 31bde5d18b0..a124cd07d55 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -111,7 +111,7 @@
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
-                <field name="name" string="My Tasks" filter_domain="[('name','ilike',self)]"/>
+                <field name="name" string="My Tasks"/>
                 <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c28f316d170..e2f2f991455 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -10,7 +10,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
-                    <field name="name" string="Issue Version" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Issue Version"/>
+                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -306,7 +307,7 @@
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <group>
-                        <field name="name" string="Feature description" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Feature description"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 57f43c17e06..b527d511d5f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -272,7 +272,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
-                        <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Project Phases"/>
                         <separator orientation="vertical"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 58784bdddb1..66633fe8ad8 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -31,7 +31,7 @@
             <field name="arch" type="xml">
                 <search string="Tasks by User">
                     <group>
-                        <field name="name" string="Date" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Date"/>
                         <separator orientation="vertical"/>
 	                    <field name="user_id"/>
                     </group>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 192fbf33dd1..0d39f9b7388 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -225,7 +225,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
@@ -257,7 +257,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index bf305c0ed12..9aa8265628b 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -124,7 +124,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group>
-                    <field name="name" string="Purchase Requisition" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Purchase Requisition"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 28eec61044d..20c1251c771 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group>
-                       <field name="name" string="Resource" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Resource"/>
                        <separator orientation="vertical"/>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
@@ -40,7 +40,7 @@
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <group>
-                       <field name="name" string="Name" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Working Time"/>
                        <separator orientation="vertical"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -56,7 +56,7 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
                    <group>
-                       <field name="name" string="Reason" filter_domain="[('name','ilike',self)]"/>
+                       <field name="name" string="Reason"/>
                        <separator orientation="vertical"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>

From 4c104ca727552d783d29b8a67043ef12201c1750 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 22 Jun 2012 15:05:06 +0200
Subject: [PATCH 161/161] [IMP] search views: made some small usability changes

bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
---
 addons/lunch/lunch_view.xml                               | 1 +
 addons/mail/mail_group_view.xml                           | 1 +
 addons/mail/mail_message_view.xml                         | 6 +++---
 addons/marketing_campaign/marketing_campaign_view.xml     | 3 +--
 addons/membership/membership_view.xml                     | 2 --
 addons/membership/report/report_membership_view.xml       | 1 -
 addons/mrp/mrp_view.xml                                   | 1 -
 addons/multi_company/res_company_view.xml                 | 1 +
 addons/point_of_sale/account_statement_view.xml           | 2 ++
 addons/point_of_sale/point_of_sale_view.xml               | 3 +--
 addons/point_of_sale/report/report_cash_register_view.xml | 8 ++++----
 addons/product/product_view.xml                           | 1 -
 addons/project/project_view.xml                           | 1 +
 addons/project/report/project_cumulative.xml              | 3 +--
 addons/project_gtd/project_gtd_view.xml                   | 1 -
 addons/project_issue/project_issue_view.xml               | 2 +-
 addons/project_timesheet/project_timesheet_view.xml       | 2 +-
 addons/sale/report/sale_report_view.xml                   | 1 -
 addons/sale/sale_view.xml                                 | 2 +-
 addons/sale_crm/sale_crm_view.xml                         | 2 +-
 addons/share/res_users_view.xml                           | 1 +
 addons/wiki/wiki_view.xml                                 | 1 +
 22 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 790559ac3bb..1777fd85da6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -367,6 +367,7 @@
                 <search string="Box Amount by User">
                     <group>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 1c8ab95fafc..921c3b528c4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -101,6 +101,7 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index c668bcdfe93..9159190ab29 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -57,6 +57,7 @@
                     <field name="model" string="Message"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
@@ -169,16 +170,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
-                    <field name="email_from" filter_domain="['|', '|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self), ('model','ilike',self)]" string="Email"/>
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
@@ -186,6 +185,7 @@
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
                         <field name="partner_id" string="Partner Name"/>
+                        <field name="model"/>
                         <field name="res_id"/>
                     </group>
                     <newline/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index afa785aad5e..aa8ea08217e 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -91,7 +91,6 @@
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
                 <separator orientation="vertical"/>
@@ -193,11 +192,11 @@
         <field name="arch" type="xml">
             <search string="Segments">
                 <field name="name" string="Segment"/>
+                <separator orientation="vertical"/>
                 <field name="date_run"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
                 <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                 <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b099d4cc406..15645294bb7 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -173,10 +173,8 @@
                     <separator orientation="vertical"/>
                     <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
                     <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
                     <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-                    <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="8">
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 94790e47021..51e1f2499b7 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -39,7 +39,6 @@
                         <field name="date_from"/>
                         <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 080b9ba7e79..9b1079dc34e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -294,7 +294,6 @@
                     <separator orientation="vertical"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 22ddec105b0..1a185fb08f3 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -50,6 +50,7 @@
             <field name="arch" type="xml">
                 <search string="Multi Company">
                     <field name="name" string="Multi Company"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 3adfce1c19c..c67fcd0e9fe 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -28,6 +28,7 @@
                 <search string="Search Cash Statements">
                     <group>
                         <field name="name" string="Cash Statement"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
@@ -54,6 +55,7 @@
                 <search string="Search Cash Statements">
                     <group>
                         <field name="name" string="Cash Statement"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index e87ff830967..003f2023460 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -139,16 +139,15 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
+                    <separator orientation="vertical"/>
                     <field name="date_order"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
                     <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 0d411d0e7b0..afd769692df 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -32,15 +32,15 @@
                     <filter icon="terp-document-new"
                         string="Draft"
                         domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
+                    <filter icon="terp-camera_test"
                           string="Confirm"
                           domain="[('state','=',('confirm'))]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-personal"
+                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        <field name="user_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c8ca653b818..506688e0a2b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -17,7 +17,6 @@
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <separator orientation="vertical" groups="base.group_multi_company" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 11caec82821..9521969857d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -140,6 +140,7 @@
                        <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
                        <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                       <separator orientation="vertical"/>
                        <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index b4bb8f6835b..69daeefc758 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -59,13 +59,12 @@
                         <separator orientation="vertical"/>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
-                        <separator orientation="vertical"/>
                         <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
                         <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id"/>
                         <field name="user_id"/>
                     </group>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index a124cd07d55..5b48f6b4648 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -116,7 +116,6 @@
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                 <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
-                <field name="context_id" widget="selection" context="{'context_show': True}"/>
                 <group expand="0" string="Display">
                     <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
                     <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e2f2f991455..1d8fe6b2509 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -153,7 +153,7 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <field name="name" string="Issue / Partner" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 61b7a8aa1af..8b6aa992366 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -81,7 +81,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
                  <field name="account_id" position="replace">
-                 <field name="account_id" string="Analytic account/project" />
+                     <field name="account_id" string="Analytic account/project"/>
                  </field>
             </field>
          </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 8e0ea6ed6d7..8eb4fc85ce6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -60,7 +60,6 @@
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bcb95f9b1bf..2b9deddb76c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -292,7 +292,7 @@
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
-                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
+                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index f099aa3bffb..8a5f56181c2 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -35,7 +35,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@string='My Sale Orders']" position="after">
+                <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
                     <filter string="My Sales Team(s)"
                         icon="terp-personal+"
                         domain="[('section_id.user_id','=',uid)]"
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 1d85857808e..defbc522340 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -8,6 +8,7 @@
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
+                    <separator orientation="vertical"/>
                     <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
                 </xpath>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d868b5ff737..8069de21d04 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -167,6 +167,7 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
                         string="Wiki"/>
+                    <separator orientation="vertical"/>
                     <field name="write_date" groups="base.group_no_one"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>