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] [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"/>