From cb1c6c08af0dad5380f1457a18d2cdb095a767bc Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Tue, 31 Jul 2012 16:58:04 +0530
Subject: [PATCH] [IMP]Improve search view in all modules

bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
---
 addons/account/account_invoice_view.xml       |  8 ++--
 addons/account/account_view.xml               | 40 +++++++++----------
 addons/account/project/project_view.xml       |  8 ++--
 .../account_analytic_entries_report_view.xml  |  6 +--
 .../report/account_entries_report_view.xml    |  6 +--
 .../report/account_invoice_report_view.xml    |  6 +--
 .../account_analytic_analysis_menu.xml        |  4 +-
 addons/account_asset/account_asset_view.xml   |  4 +-
 .../report/account_asset_report_view.xml      |  4 +-
 .../account_bank_statement_view.xml           |  6 +--
 addons/account_coda/account_coda_view.xml     | 12 +++---
 .../report/account_followup_report.xml        |  2 +-
 .../wizard/account_followup_print_view.xml    |  2 +-
 .../account_payment/account_payment_view.xml  |  2 +-
 .../account_voucher/account_voucher_view.xml  |  6 +--
 .../account_voucher_sales_receipt_view.xml    |  2 +-
 .../voucher_payment_receipt_view.xml          |  8 ++--
 .../voucher_sales_purchase_view.xml           |  8 ++--
 addons/audittrail/audittrail_view.xml         |  2 +-
 addons/base_calendar/base_calendar_view.xml   |  4 +-
 addons/base_calendar/crm_meeting_view.xml     |  4 +-
 addons/caldav/caldav_view.xml                 |  4 +-
 addons/crm/crm_lead_view.xml                  | 14 +++----
 addons/crm/crm_phonecall_view.xml             |  6 +--
 addons/crm/crm_report_view.xml                | 10 ++---
 addons/crm/report/crm_lead_report_view.xml    |  4 +-
 .../crm/report/crm_phonecall_report_view.xml  |  4 +-
 addons/crm_claim/crm_claim_view.xml           |  4 +-
 .../report/crm_claim_report_view.xml          |  6 +--
 .../crm_fundraising/crm_fundraising_view.xml  |  4 +-
 .../report/crm_fundraising_report_view.xml    |  6 +--
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  6 +--
 .../report/crm_helpdesk_report_view.xml       |  6 +--
 .../report/crm_lead_report_view.xml           |  4 +-
 addons/document/document_view.xml             |  4 +-
 addons/email_template/email_template_view.xml |  2 +-
 addons/event/event_view.xml                   |  6 +--
 .../report/report_event_registration_view.xml |  4 +-
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  6 +--
 .../report/hr_evaluation_report_view.xml      |  4 +-
 addons/hr_expense/hr_expense_view.xml         |  6 +--
 .../report/hr_expense_report_view.xml         |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  6 +--
 addons/hr_payroll/hr_payroll_view.xml         |  6 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  4 +-
 .../report/hr_recruitment_report_view.xml     |  6 +--
 .../hr_timesheet_invoice_report_view.xml      |  8 ++--
 .../report/report_analytic_view.xml           |  2 +-
 .../hr_timesheet_sheet_view.xml               |  6 +--
 .../report/timesheet_report_view.xml          |  4 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/lunch/lunch_view.xml                   |  6 +--
 addons/mail/mail_message_view.xml             |  2 +-
 .../marketing_campaign_view.xml               | 10 ++---
 .../report/campaign_analysis_view.xml         |  6 +--
 addons/membership/membership_view.xml         |  2 +-
 .../report/report_membership_view.xml         |  4 +-
 addons/mrp/mrp_view.xml                       |  8 ++--
 addons/mrp_operations/mrp_operations_view.xml |  4 +-
 .../report/mrp_workorder_analysis_view.xml    |  4 +-
 addons/mrp_repair/mrp_repair_view.xml         |  4 +-
 .../point_of_sale/account_statement_view.xml  |  4 +-
 addons/point_of_sale/point_of_sale_view.xml   | 12 +++---
 .../report/pos_order_report_view.xml          |  8 ++--
 addons/process/process_view.xml               |  2 +-
 addons/procurement/procurement_view.xml       |  2 +-
 addons/product/pricelist_view.xml             |  2 +-
 addons/product/product_view.xml               |  4 +-
 addons/project/project_view.xml               |  8 ++--
 addons/project/report/project_cumulative.xml  |  4 +-
 addons/project/report/project_report_view.xml |  6 +--
 addons/project_issue/project_issue_view.xml   |  8 ++--
 .../report/project_issue_report_view.xml      |  8 ++--
 .../project_long_term_view.xml                |  2 +-
 addons/purchase/purchase_view.xml             | 13 +++---
 .../purchase/report/purchase_report_view.xml  |  4 +-
 addons/purchase/stock_view.xml                |  6 +--
 .../purchase_requisition_view.xml             |  2 +-
 .../report_intrastat_view.xml                 |  2 +-
 addons/resource/resource_view.xml             |  4 +-
 addons/sale/report/sale_report_view.xml       |  6 +--
 addons/sale/sale_view.xml                     | 18 ++++-----
 .../stock/report/report_stock_move_view.xml   | 10 ++---
 addons/stock/report/report_stock_view.xml     |  2 +-
 addons/stock/stock_view.xml                   | 35 ++++++++--------
 addons/stock_planning/stock_planning_view.xml |  4 +-
 addons/subscription/subscription_view.xml     |  4 +-
 addons/survey/survey_view.xml                 |  8 ++--
 addons/wiki/wiki_view.xml                     |  2 +-
 92 files changed, 272 insertions(+), 276 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d039eb87906..f1a8c82b382 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -443,16 +443,16 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                     <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Salesperson"/>
-                    <field name="journal_id"/>
-                    <field name="period_id" string="Period"/>
                     <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"/>
                     <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="journal_id"/>
+                    <field name="period_id" string="Period"/>
                     <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'}"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7c1d9ab8137..8a9f5ca59ff 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -210,9 +210,9 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
-                    <field name="user_type"/>
                     <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                    <field name="user_type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
@@ -427,11 +427,11 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
-                    <field name="user_id"/>
                     <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', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                         <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
@@ -524,10 +524,10 @@
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
                     <field name="date"/>
-                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
                     <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"/>
+                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
@@ -562,10 +562,10 @@
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
                     <field name="date"/>
-                    <field name="period_id"/>
-                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
                     <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                     <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <field name="period_id"/>
+                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
@@ -1162,11 +1162,6 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <field name="date"/>
-                    <field name="move_id" string="Number (Move)"/>
-                    <field name="account_id"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" context="{'journal_id':self}"/>
-                    <field name="period_id" context="{'period_id':self}"/>
                     <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1175,6 +1170,11 @@
                     <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/>
                     <separator/>
                     <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)]"/>
+                    <field name="move_id" string="Number (Move)"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id':self}"/>
+                    <field name="period_id" context="{'period_id':self}"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1400,13 +1400,13 @@
                 <search string="Search Move">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
                     <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/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1620,10 +1620,10 @@
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
                     <field name="name" string="Journal Entry Model"/>
-                    <field name="journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
@@ -1795,9 +1795,9 @@
                 <search string="Entry Subscription">
                     <field name="name" string="Account Subscription"/>
                     <field name="date_start"/>
-                    <field name="model_id"/>
                     <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"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -2055,11 +2055,11 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                    <field name="parent_id"/>
-                    <field name="user_type"/>
                     <field name="type"/>
                     <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                    <field name="parent_id"/>
+                    <field name="user_type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
@@ -2235,9 +2235,9 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
-                    <field name="chart_template_id"/>
                     <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"/>
+                    <field name="chart_template_id"/>
                 </search>
             </field>
         </record>
@@ -2707,8 +2707,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <field name="name" string="Account Report"/>
-                    <field name="account_report_id"/>
                     <field name="type"/>
+                    <field name="account_report_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7fd782f3cc6..de1a087d9c5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -32,10 +32,10 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <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"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -178,13 +178,13 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <field name="account_id"/>
-                    <field name="user_id"/>
                     <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"/>
                     <separator/>
                     <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
                     <group string="Group By..." expand="0">
                         <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index dd927928600..efb45f12a64 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -36,9 +36,6 @@
             <search string="Analytic Entries Analysis">
                 <field name="day" string="Day"/>
                 <field name="date"/>
-                <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"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -52,6 +49,9 @@
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="product_id" />
+                    <field name="user_id"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index fbe44ee8d12..8c445052094 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -70,9 +70,6 @@
                 <field name="date"/>
                 <field name="date_created"/>
                 <field name="date_maturity"/>
-                <field name="account_id"/>
-                <field name="journal_id"/>
-                <field name="period_id"/>
                 <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
                 <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
                 <separator/>
@@ -81,6 +78,9 @@
                 <separator/>
                 <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
                 <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
+                <field name="account_id"/>
+                <field name="journal_id"/>
+                <field name="period_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="fiscalyear_id"/>
                     <field name="product_id"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 4af7bb038be..e3e0b210f20 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,9 +56,6 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
                 <field name="date"/>
-                <field name="partner_id"/>
-                <field name="user_id" />
-                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <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/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
@@ -69,6 +66,9 @@
                 <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
                 <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
                 <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
+                <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index ef9fbcdf130..bca6b2ab260 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -21,8 +21,6 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <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/>
@@ -32,6 +30,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" />
                     <separator/>
                     <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index b91fdf7e0c1..cdc772ad65d 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -232,10 +232,10 @@
             <search string="Account Asset">
                 <field name="name" string="Asset"/>
                 <field name="purchase_date"/>
-                <field name="category_id"/>
-                <field name="partner_id"/>
                 <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"/>
+                <field name="category_id"/>
+                <field name="partner_id"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index e916b7401df..a6652890ec5 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -45,12 +45,12 @@
             <search string="Assets Analysis">
                 <field name="purchase_date"/>
                 <field name="depreciation_date"/>
-                <field name="asset_id"/>
-                <field name="asset_category_id"/>
                 <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/>
                 <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
+                <field name="asset_id"/>
+                <field name="asset_category_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
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 e16e316b6b9..c77fb896840 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -125,14 +125,14 @@
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
                 <field name="val_date"/>
-                <field name="journal_id"/>
-                <field name="statement_id"/>
-                <field name="globalisation_id" string="Glob. Id"/>
                 <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/>
                 <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."/>
+                <field name="journal_id"/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
                 <group string="Extended Filters..." expand="0">
                     <field name="account_id"/>
                     <field name="partner_id"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 5af713a501d..07f397c663f 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -13,12 +13,12 @@
         <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"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
                 <field name="currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
-                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <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'}"/>
@@ -381,11 +381,11 @@
             <search string="Search CODA Bank Statements">
                 <field name="name" string="CODA Bank Statement"/>
                 <field name="date"/>
+                <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
                 <field name="period_id"/>
                 <field name="coda_bank_account_id"/>
                 <field name="journal_id" domain="[('type', '=', 'bank')]"/>
-                <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-                <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
                 <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"/>
@@ -466,10 +466,10 @@
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
                 <field name="val_date"/>
-                <field name="statement_id"/>
-                <field name="globalisation_id" string="Glob. Id"/>
                 <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."/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="coda_bank_account_id"/>
                     <field name="account_id"/>
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index dbdafdbeb0b..c881475dc43 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -42,13 +42,13 @@
                 <search string="Follow-ups Sent">
                     <field name="date_move"/>
                     <field name="date_move_last"/>
-                    <field name="partner_id"/>
                     <field name="balance"/>
                     <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/>
                     <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
                         help = "Including journal entries marked as a litigation"/>
+                    <field name="partner_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index f6bef24e975..2949177205f 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
                     <field name="date_followup"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
                     <field name="partner_id"/>
                     <field name="max_followup_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
                 </search>
             </field>
         </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 147bb31d78e..e7100e4f2d5 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -214,12 +214,12 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <field name="reference" string="Payment Order"/>
-                    <field name="mode"/>
                     <field name="state"/>
                     <field name="date_done"/>
                     <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"/>
+                    <field name="mode"/>
                     <group expand="0" string="Group By...">
                         <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index dc347d41b98..b212c07acb3 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -128,13 +128,13 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
-                    <field name="period_id"/>
                     <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/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
+                    <field name="period_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
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 b94164af1a4..527c959c2ad 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -50,10 +50,10 @@
             <search string="Sales Receipt Analysis">
                 <field name="date"/>
                 <field name="date_due"/>
-                <field name="partner_id"/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
                 <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
+                <field name="partner_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id"/>
                     <field name="account_id"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ea62e536b9d..3d97c20b25a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -10,11 +10,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <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"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
-                    <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"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -34,11 +34,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <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"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
-                    <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"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1f8faef7372..8390f20b4f0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -9,11 +9,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <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"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                     <field name="period_id"/>
-                    <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"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -32,11 +32,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <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"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                     <field name="period_id"/>
-                    <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"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 60ec0949413..65eca09a9a1 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -64,9 +64,9 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                     <field name="name" string="Audittrail Rule"/>
-                    <field name="object_id" string="Model"/>
                     <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"/>
+                    <field name="object_id" string="Model"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 3cc24c09599..600e30d686a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -86,12 +86,12 @@
                 <search string="Search Invitations">
                     <field name="email" string="Email"/>
                     <field name="event_date"/>
-                    <field name="user_id" string="Responsible"/>
                     <field name="cutype" string="Invitation type"/>
                     <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
                     <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
                     <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
                     <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
+                    <field name="user_id" string="Responsible"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
@@ -395,12 +395,12 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                     <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
-                    <field name="user_id"/>
                     <field name="show_as"/>
                     <field name="class" string="Privacy"/>
                     <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
                     <separator/>
                     <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 2fae24de104..c99c77e4799 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -303,11 +303,11 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <field name="user_id"/>
-                <field name="partner_ids"/>
                 <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
                 <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                <field name="user_id"/>
+                <field name="partner_ids"/>
             </search>
         </field>
     </record>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 5a93fceabeb..f439ce7f81b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -143,11 +143,11 @@
                 <tree string="Calendars" toolbar="1">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user_id"/>
-                    <field name="collection_id" required="1"/>
                     <field name="has_webcal" groups="base.group_no_one" />
                     <field name="calendar_color" groups="base.group_no_one" />
                     <field name="calendar_order" groups="base.group_no_one" />
+                    <field name="user_id"/>
+                    <field name="collection_id" required="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 870d6ed7c1e..b2a22d43bd5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -353,9 +353,6 @@
                 <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="subjects"/>
                 <field name="create_date"/>
-                <field name="user_id"/>
-                <field name="section_id" context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
                 <separator/>
@@ -367,6 +364,9 @@
                 <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="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <field name="user_id"/>
+                <field name="section_id" context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <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'}"/>
@@ -584,10 +584,6 @@
             <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)]"/>
-                <field name="user_id"/>
-                <field name="country_id"/>
-                <field name="partner_id"/>
-                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
                 <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
@@ -598,6 +594,10 @@
                 <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" />
+                <field name="user_id"/>
+                <field name="country_id"/>
+                <field name="partner_id"/>
+                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                 <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 3958d4a7721..2953e963647 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -216,9 +216,6 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
-               <field name="partner_id"/>
-               <field name="user_id"/>
-               <field name="section_id" string="Sales Team"/>
                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
@@ -227,6 +224,9 @@
                <separator/>
                <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="Phone Calls that are assigned to me or to my team(s)" />
+               <field name="partner_id"/>
+               <field name="user_id"/>
+               <field name="section_id" string="Sales Team"/>
                <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'}" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index f46be9b6dfa..eaed4564424 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -71,10 +71,10 @@
                 <search string="Cases by Team and Type">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
-                    <field name="category2_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
+                    <field name="category2_id"/>
                </search>
             </field>
         </record>
@@ -156,9 +156,9 @@
                 <search string="Cases by Team and Stage">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
         </record>
@@ -225,9 +225,9 @@
                 <search string="Cases by Section, Category and Stage">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
         </record>
@@ -311,9 +311,9 @@
                 <search string="Search Cases by User">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 42beb7b5279..9d0050be69c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -70,8 +70,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <field name="section_id" context="{'invisible_section': False}"/>
-                    <field name="user_id" string="Salesperson"/>
                     <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
                     <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
                     <separator/>
@@ -84,6 +82,8 @@
                             help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 26db9c1df66..2eeff7a0981 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,8 +51,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
-                    <field name="user_id" string="Salesperson"/>
                     <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
                         help="Phone calls which are in draft and open state"/>
                     <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]"
@@ -64,6 +62,8 @@
                             help="Phone calls that are assigned to one of the sale teams I manage"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e16ed3d4029..6c508049e5e 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -199,13 +199,13 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e6d1b5a2cfe..adfb97a28f0 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -53,9 +53,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <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}"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
@@ -65,6 +62,9 @@
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <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  expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 3abfbe89eab..7ee3f35d2a6 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -174,8 +174,6 @@
                     <search string="Search Funds">
                         <field name="name" string="Fund Description"/>
                         <field name="state"/>
-                        <field name="user_id"/>
-                        <field name="section_id" string="Sales Team"/>
                         <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
@@ -184,6 +182,8 @@
                         <separator/>
                         <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" />
+                        <field name="user_id"/>
+                        <field name="section_id" string="Sales Team"/>
                         <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'}" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 3459495f671..028635b083c 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -77,9 +77,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <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"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
@@ -89,6 +86,9 @@
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <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  expand="0" string="Extended Filters...">
                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f9f17781a61..0fb0cbf825f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -153,15 +153,15 @@
                 <search string="Search Helpdesk">
                     <field name="name" string="Query"/>
                     <field name="date"/>
-                    <field name="partner_id" />
-                    <field name="user_id"/>
-                    <field name="section_id" string="Sales Team"/>
                     <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" />
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" />
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
                     <separator/>
                     <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" />
+                    <field name="partner_id" />
+                    <field name="user_id"/>
+                    <field name="section_id" string="Sales Team"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2c7a9f06654..9aab23eab70 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,9 +53,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <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"/>
                     <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
                     <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" />
                     <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" />
@@ -65,6 +62,9 @@
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                    <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 expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_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 9b8e66964d3..f88d7e91f00 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,12 +9,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
+                    <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
+                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="grade_id"/>
                     <field name="user_id"/>
                     <field name="partner_assigned_id"/>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
-                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
                     <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
                       <separator/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fa65d75c875..3f5768b8c4a 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -171,11 +171,11 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <field name="name" string="Document Directory"/>
+                    <filter string="Static" domain="[('type','=','directory')]"/>
+                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
                     <field name="user_id" />
-                    <filter string="Static" domain="[('type','=','directory')]"/>
-                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index dcfbc1bcc6b..daa4d028651 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -123,8 +123,8 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
-                    <field name="model_id"/>
                     <field name="lang"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group by...">
                         <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 77c06d8c389..6415ad10f99 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -330,7 +330,6 @@
                 <search string="Events">
                     <field name="name" string="Events"/>
                     <field name="type"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
@@ -339,6 +338,7 @@
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <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="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
@@ -515,14 +515,14 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <field name="event_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <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/>
                     <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
+                    <field name="event_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index ed8b66aa948..f05fdcc09e1 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -52,12 +52,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id"/>
                     <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/>
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
+                    <field name="event_id" string="Event"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="event_type" widget="selection"/>
                         <field name="event_date"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c9c9ef77195..eada4f23602 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -415,9 +415,9 @@
             <field name="arch" type="xml">
                 <search string="Jobs">
                     <field name="name" string="Job"/>
-                    <field name="department_id"/>
                     <filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/>
+                    <field name="department_id"/>
                     <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'}"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 843d58b4690..8a671e8438f 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,11 +55,11 @@
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
                     <field name="name" string="Attendance"/>
-                    <field name="employee_id"/>
                     <field name="action"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <separator/>
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="employee_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ed7f17bbf40..2009e500bf9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -43,8 +43,8 @@
                    <field name="name" string="Contracts"/>
                    <field name="date_start"/>
                    <field name="date_end"/>
-                   <field name="employee_id"/>
                    <field name="working_hours"/>
+                   <field name="employee_id"/>
                    <group expand="0" string="Group By...">
                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                        <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6f998faa9e9..c67b5b51d1f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,10 +231,10 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date"/>
-                    <field name="employee_id" />
-                    <field name="plan_id"/>
                     <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"/>
+                    <field name="employee_id" />
+                    <field name="plan_id"/>
                     <group expand='0' string='Group by...'>
                         <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
                         <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
@@ -319,9 +319,9 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date_deadline"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <field name="user_to_review_id"/>
                     <field name="user_id" string="Interviewer"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c08bce9f3a4..f92ff1efedb 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -45,11 +45,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
-                <field name="employee_id"/>
-                <field name="plan_id"/>
                 <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')]" help = "Final Validation Evaluations"/>
                 <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <field name="employee_id"/>
+                <field name="plan_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="rating"/>
                     <field name="deadline"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 83772b6a3af..24514241916 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -138,12 +138,12 @@
                 <search string="Expense">
                     <field name="name" string="Expenses"/>
                     <field name="date"/>
-                    <field name="employee_id"/>
-                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
-                    <field name="user_id"  string="User"/>
                     <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"/>
                     <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <field name="employee_id"/>
+                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+                    <field name="user_id"  string="User"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 01d7a9b7bef..73ec45bde02 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,11 +51,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-                <field name="employee_id"/>
-                <field name="department_id"/>
                 <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
                 <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
                 <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+                <field name="employee_id"/>
+                <field name="department_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="product_id"/>
                     <field name="user_id"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9a715b48efa..29ca1e7b87d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -45,9 +45,6 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
-                    <field name="holiday_status_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
@@ -59,6 +56,9 @@
                     <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <field name="holiday_status_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f9b5ae67f94..b08ce6983c6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -177,8 +177,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <field name="slip_id"/>
                     <field name="amount_select"/>
+                    <field name="slip_id"/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
                         <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
@@ -360,10 +360,10 @@
                 <search string="Search Payslips">
                     <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="payslip_run_id"/>
                     <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"/>
+                    <field name="employee_id"/>
+                    <field name="payslip_run_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 77b881de5e1..ad139b088d0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -214,8 +214,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-                <field name="job_id"/>
-                <field name="user_id"/>
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
@@ -227,6 +225,8 @@
                 <separator/>
                 <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"/>
+                <field name="job_id"/>
+                <field name="user_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4c8d967845b..afb87aba4ff 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,15 +49,15 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <field name="job_id"/>
-                <field name="department_id"/>
-                <field name="user_id" string="Responsible"/>
                 <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
                 <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
                 <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
                 <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
                 <separator/>
                 <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
+                <field name="job_id"/>
+                <field name="department_id"/>
+                <field name="user_id" string="Responsible"/>
                 <group expand="0" string="Extended Filters...">
                     <!--field name="job_id"/-->
                     <field name="priority"/>
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 1fad5f92b2e..5048f2c9193 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
@@ -46,10 +46,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
+                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <field name="user_id"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
-                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="date"/>
                         <field name="invoice_id"/>
@@ -140,8 +140,8 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <field name="name" string="Timesheet by users"/>
-                    <field name="user_id"/>
                     <field name="month"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -269,9 +269,9 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <field name="name" string="Timesheet by account"/>
+                    <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
-                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -335,9 +335,9 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <field name="name" string="Timesheet by account"/>
+                    <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
-                    <field name="month"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 05319b075e8..6dbbb85aea9 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,9 +114,9 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                     <field name="name" string="Analytic Lines"/>
+                    <field name="month"/>
                     <field name="product_id"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="month"/>
                </search>
             </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 0c1e2e0771b..86ef3255286 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -23,9 +23,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
-                    <field name="sheet_id" />
                     <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="invoice_rate"/>
+                    <field name="sheet_id" />
                 </search>
             </field>
         </record>
@@ -157,10 +157,10 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
                     <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"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 1e061b12d36..9956ed2655e 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -48,11 +48,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <field name="account_id"/>
-                    <field name="user_id" />
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <field name="account_id"/>
+                    <field name="user_id" />
                     <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
                         <field name="to_invoice"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8e1e4b50a5f..4508301ca8c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -111,10 +111,10 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <field name="name" string="Idea"/>
-                <field name="category_ids"/>
                 <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"/>
                 <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
+                <field name="category_ids"/>
                 <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 40231d6c948..d953dfbd1a9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -76,9 +76,9 @@
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
                     <field name="date"/>
-                    <field name="user_id"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
@@ -295,8 +295,8 @@
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" string="Product"/>
-                    <field name="category_id"/>
                     <field name="price"/>
+                    <field name="category_id"/>
                 </search>
             </field>
         </record>
@@ -370,9 +370,9 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <field name="date"/>
-                    <field name="user_id"/>
                     <field name="box"/>
                     <field name="amount"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 796aaebf945..b967035bec3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -78,7 +78,6 @@
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
                     <filter icon="terp-personal+" string="My Feeds"
@@ -103,6 +102,7 @@
                             domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
                                         ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
                                     ]"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a3d8af6c048..61981c54928 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -114,12 +114,12 @@
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
-                <field name="object_id" string="Resource"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                 <separator/>
                 <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')]"/>
+                <field name="object_id" string="Resource"/>
                 <group expand="0" string="Group By...">
                     <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
                     <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
@@ -211,14 +211,14 @@
             <search string="Segments">
                 <field name="name" string="Segment"/>
                 <field name="date_run"/>
-                <field name="campaign_id"/>
-                <field name="object_id"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                 <separator/>
                 <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')]"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -407,13 +407,13 @@
             <search string="Marketing Campaign Activities">
                 <field name="res_name" string="Marketing Campaign Activity"/>
                 <field name="date"/>
+                <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')]"/>
                 <field name="campaign_id"/>
                 <field name="segment_id"/>
                 <field name="object_id"/>
                 <field name="partner_id"/>
                 <field name="res_id"/>
-                <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')]"/>
                 <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'}"/>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 04b91a268b0..30913f1b532 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -32,14 +32,14 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                 <field name="date"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
+                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <field name="campaign_id"/>
                 <field name="activity_id"/>
                 <field name="segment_id"/>
                 <field name="partner_id"/>
                 <field name="country_id"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
-                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <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'}"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 3d5e008160e..18025408bd1 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
-                    <field name="categ_id" operator="child_of"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <field name="categ_id" operator="child_of"/>
                     <group  expand='0' string='Group by...'>
                         <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                         <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index bb66aca3f94..71e1c6f7876 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,11 +36,11 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <field name="date_from"/>
+                    <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"/>
+                    <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"/>
-                    <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"/>
-                    <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"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 232c8edf123..c6a226aeb40 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -88,8 +88,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="name" string="Name"/>
-                    <field name="group_id" />
                     <field name="composition"/>
+                    <field name="group_id" />
                     <group expand="0" string="Group By...">
                         <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
@@ -301,9 +301,9 @@
             <field name="arch" type="xml">
                 <search string="Routing">
                     <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -820,8 +820,6 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                     <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="product_id"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]"
                         help="Manufacturing Orders which are waiting for raw materials."/>
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]"
@@ -831,6 +829,8 @@
                     <separator/>
                     <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"/>
+                    <field name="product_id"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index f8ff9f4eada..4e77100bb95 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -125,8 +125,6 @@
             <search string="Search Work Orders">
                 <field name="name" string="Work Orders"/>
                 <field name="date_planned"/>
-                <field name="workcenter_id"/>
-                <field name="production_id"/>
                 <field name="state"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
@@ -134,6 +132,8 @@
                 <separator/>
                 <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"/>
+                <field name="workcenter_id"/>
+                <field name="production_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
                     <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index c2ae1be9cd9..0c9ee4c6726 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,11 +47,11 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="date"/>
-                    <field name="product_id" />
-                    <field name="workcenter_id"/>
                     <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')]"/>
+                    <field name="product_id" />
+                    <field name="workcenter_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
                         <filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" />
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 739c8f108a7..24c8a0db2b2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -190,14 +190,14 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <field name="name" string="Reair Orders"/>
-                  <field name="product_id"/>
-                  <field name="partner_id"/>
                   <field name="state"/>
                   <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/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
+                  <field name="product_id"/>
+                  <field name="partner_id"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index b690e8d9ba7..8568c8d60d9 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -29,8 +29,8 @@
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
                     <field name="date"/>
-                    <field name="journal_id"/>
                     <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                    <field name="journal_id"/>
                     <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"/>
@@ -48,9 +48,9 @@
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
                     <field name="date"/>
-                    <field name="journal_id"/>
                     <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                     <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <field name="journal_id"/>
                     <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"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 57dce86afcb..fc0de4c9198 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -140,11 +140,11 @@
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
                     <field name="date_order"/>
-                    <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <field name="user_id"/>
                     <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'}"/>
@@ -831,9 +831,9 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
                     <field name="name" />
-                    <field name="shop_id" />
                     <filter string="Active" domain="[('state', '=', 'active')]" />
                     <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
+                    <field name="shop_id" />
                 </search>
             </field>
         </record>
@@ -978,12 +978,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
-                    <field name="config_id" />
                     <field name="name" />
-                    <field name="user_id" />
                     <filter string="Open" domain="[('state', '=', 'opened')]" />
                     <separator/>
                     <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
+                    <field name="config_id" />
+                    <field name="user_id" />
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
@@ -1023,13 +1023,13 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name"/>
-                    <field name="user_id"/>
                     <field name="date_order"/>
-                    <field name="session_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <field name="user_id"/>
+                    <field name="session_id"/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_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 297ac7e8c7f..e103fe4e6c0 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -34,11 +34,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
-                    <field name="partner_id"/>
                     <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-dolar" string="Invoiced" domain="[('state','=',('invoiced'))]"/>
                     <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/>
                     <separator/>
@@ -48,6 +44,10 @@
                          help="POS ordered created by today"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index a2d60f9bd0a..66dcb87289a 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -214,8 +214,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <field name="name" string="Process Node"/>
-                <field name="model_id"/>
                 <field name="kind" />
+                <field name="model_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d7003c41b3e..247c081b8f9 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -119,7 +119,6 @@
                 <search string="Search Procurement">
                     <field name="origin" string="Procurement"/>
                     <field name="date_planned"/>
-                    <field name="product_id" />
                     <field name="state" />
                     <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                     <separator/>
@@ -127,6 +126,7 @@
                     <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                     <separator/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]" help="Procurement started late" />
+                    <field name="product_id" />
                     <group expand="0" string="Group By">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f832a6d46c6..529add848bf 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -113,9 +113,9 @@
             <field name="arch" type="xml">
                 <search string="Products Price Search">
                     <field name="name" string="Products Price"/>
-                    <field name="currency_id"/>
                     <field name="type"/>
                     <field name="active" />
+                    <field name="currency_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3ddee91b468..e5161feea13 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,7 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
-                   <field name="categ_id" operator="child_of"/>
                    <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/>
@@ -19,8 +18,7 @@
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
+                   <field name="categ_id" operator="child_of"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 62665109ec1..9bb2a8e9a75 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -156,8 +156,6 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Partner"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
@@ -167,6 +165,8 @@
                     <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
                     <separator/>
                     <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 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'}"/>
@@ -627,8 +627,6 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
@@ -642,6 +640,8 @@
                     <separator/>
                     <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+"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index f9a377246b9..ae87b3f2fe2 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,8 +55,6 @@
             <field name="arch" type="xml">
                 <search string="Task's Analysis">
                     <field name="date"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <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/>
@@ -67,6 +65,8 @@
                     <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                     <separator/>
                     <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 45c813bb596..ab880536ced 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -61,9 +61,6 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="date_deadline"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
-                    <field name="partner_id" />
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
                     <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
                     <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
@@ -73,6 +70,9 @@
                     <separator/>
                     <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 name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id" />
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e96d416e51f..a46fb3d3c5b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -206,8 +206,6 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                    <field name="user_id"/>
-                    <field name="project_id"/>
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
@@ -215,6 +213,8 @@
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                     <separator/>
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                    <field name="user_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -344,11 +344,11 @@
                 <search string="Feature Tracker Search">
                     <field name="name" string="Feature description"/>
                     <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="project_id" string="Project"/>
                     <field name="state" groups="base.group_no_one"/>
                     <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 name="user_id"/>
+                    <field name="project_id" string="Project"/>
                 </search>
             </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 634e40a7d56..e0b505276d8 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -53,14 +53,14 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
-                    <field name="version_id"/>
                     <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" string="Pending" domain="[('state','=','pending')]"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="version_id"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d60ffb88b21..ed63218e37b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -271,12 +271,12 @@
                     <field name="name" string="Project Phases"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="project_id"/>
                     <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"/>
                     <separator/>
                     <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 012bca66bac..ddd752ccb99 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -269,14 +269,14 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
                     <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"/>
                     <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/>
                     <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."/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -295,9 +295,6 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
@@ -305,6 +302,9 @@
                     <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/>
                     <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."/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -554,6 +554,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index b0d386e667e..aa915c620f5 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,10 +53,10 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-                <field name="partner_id"/>
-                <field name="product_id"/>
                 <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')]"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="user_id"/>
                     <field name="validator"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7d1a6ea895f..2191e642ab2 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -47,15 +47,15 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="purchase_id" />
                     <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/>
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="purchase_id" />
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index af2106d5466..e0b8db4862f 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -135,13 +135,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                     <field name="name" string="Purchase Requisition"/>
-                    <field name="user_id" />
                     <field name="exclusive" />
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
+                    <field name="user_id" />
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 71dab48dd03..73cf99bec34 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,9 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
-                    <field name="intrastat_id"/>
                     <field name="month"/>
                     <field name="type"/>
+                    <field name="intrastat_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ddb31744e65..5b388469f3c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,10 +11,10 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <field name="name" string="Resource"/>
-                   <field name="user_id" string="User"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
                    <field name="resource_type"/>
                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                   <field name="user_id" string="User"/>
+                   <field name="company_id" groups="base.group_multi_company"/>
                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 88c15e38d20..1ac6d425530 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -52,15 +52,15 @@
             <search string="Sales Analysis">
                 <field name="date"/>
                 <field name="date_confirm"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="user_id"/>
                 <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/>
                 <separator/>
                 <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/>
                 <separator/>
                 <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="user_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id"/>
                     <field name="categ_id"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ee440ffe4df..48e823250dc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -359,8 +359,6 @@
             <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)]"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
@@ -368,6 +366,8 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator/>
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <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'}"/>
@@ -523,13 +523,13 @@
             <field name="type">search</field>
             <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"/>
+                    <separator/>
+                    <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 name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
-                    <separator/>
-                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
@@ -546,10 +546,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <field name="order_id"/>
-                    <field name="order_partner_id"/>
-                    <field name="product_id"/>
-                    <field name="salesman_id"/>
                     <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"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
@@ -557,6 +553,10 @@
                     <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"/>
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
+                    <field name="order_id"/>
+                    <field name="order_partner_id"/>
+                    <field name="product_id"/>
+                    <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 69f26dbb374..56d17976aad 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -56,14 +56,14 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Moves Analysis">
-                <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"/>
                 <separator/>
                 <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')]"/>
+                <field name="product_id" default_focus="1"/>
+                <field name="partner_id" context="{'contact_display':'partner'}"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="location_id" />
                     <field name="location_dest_id" />
@@ -144,15 +144,15 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
-                <field name="product_id" default_focus="1"/>
-                <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
-                <field name="company_id" groups="base.group_multi_company"/>
                 <filter string="Real" name="real" 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/>
                 <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
+                <field name="product_id" default_focus="1"/>
+                <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="product_categ_id" />
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index bcd5d903251..15dafbfdbc1 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -35,11 +35,11 @@
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
                     <field name="date"/>
-                    <field name="product_id"/>
                     <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/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv" domain="[('date','=', False)]"/>
+                    <field name="product_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 94c9b0e25b1..ed2aaad244d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -398,8 +398,8 @@
                 <search string="Product Lots Filter">
                     <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
                     <field name="date"/>
-                    <field name="product_id"/>
                     <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots"/>
+                    <field name="product_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
@@ -554,10 +554,10 @@
             <field name="arch" type="xml">
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
-                    <field name="location_id" string="Parent Location"/>
                     <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
                     <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
                     <filter icon="terp-personal" name="supplier" string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
+                    <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
         </record>
@@ -871,12 +871,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="stock_journal_id"/>
                     <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"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -976,8 +976,6 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <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"/>
@@ -985,6 +983,8 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1082,14 +1082,14 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="product_id"/>
                     <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/>
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="product_id"/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1267,15 +1267,15 @@
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
                     <field name="date" groups="base.group_no_one"/>
-                    <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="prodlot_id"/>
                     <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/>
                     <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"/>
+                    <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="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
@@ -1371,13 +1371,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
                     <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/>
                     <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"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -1396,13 +1396,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
                     <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/>
                     <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"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -1579,7 +1579,6 @@
             <field name="arch" type="xml">
                 <search string="Stock Journal">
                     <field name="name" string="Stock Journal"/>
-                    <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 bb6cd7e3515..8c1cb0d2c80 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -196,12 +196,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
@@ -302,11 +302,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <field name="company_id"/>
                     <field name="warehouse_id"/>
                     <field name="period_id"/>
                     <field name="product_id"/>
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9528f72bfa8..e7244c7ff1d 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -75,11 +75,11 @@
                 <search string="Search Subscription">
                     <field name="name" string="Subscription"/>
                     <field name="date_init"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
                     <filter icon="terp-check"
                             string="Running"
                             domain="[('state','=','running')]"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index ead5380921f..22838058bec 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -279,11 +279,11 @@
                 <search string="Search Survey">
                     <field name="title" string="Survey"/>
                     <field name="type"/>
-                    <field name="responsible_id"/>
                     <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"/>
                     <separator/>
                     <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
+                    <field name="responsible_id"/>
                    <group expand="0" string="Group By...">
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
@@ -752,9 +752,9 @@
             <field name="arch" type="xml">
                 <search string="Search Question">
                     <field name="question" string="Question"/>
-                    <field name="page_id"/>
                     <field name="survey"/>
                     <field name="type"/>
+                    <field name="page_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
@@ -1172,13 +1172,13 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                     <field name="email" string="Survey"/>
-                    <field name="survey_id" widget="selection"/>
-                    <field name="user_id"/>
                     <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                     <separator/>
                     <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                     <separator/>
                     <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                    <field name="survey_id" widget="selection"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d39b986e04e..d0d4c35a80d 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -177,9 +177,9 @@
                         filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
                         string="Wiki"/>
                     <field name="write_date" groups="base.group_no_one"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <field name="group_id"/>
                     <field name="write_uid"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>