diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 58a1abac364..68a723aa4a0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -405,23 +405,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group>
+                    <group>
+                        <field name="number"
+                            string="Invoice"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <field name="number"
-                            string="Reference"
-                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="user_id" widget="selection" string="Salesperson"/>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id" string="Period"/>
                     </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d8959b896f6..ab46f7519f8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
                         <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="state"/>
                     </group>
                     <newline/>
@@ -141,10 +141,9 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                     </group>
                 </search>
             </field>
@@ -217,11 +216,11 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="user_type"/>
                     </group>
                     <newline/>
@@ -379,7 +378,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
-                    <field name="name"/>
+                    <field name="name" string="Journal View"/>
                 </search>
             </field>
         </record>
@@ -440,13 +439,13 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
+                    <separator orientation="vertical"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="user_id"/>
                     </group>
                     <newline/>
@@ -521,12 +520,14 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                         <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
                     </group>
                     <newline/>
@@ -564,11 +565,13 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="date"/>
                         <field name="period_id"/>
                         <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
                     </group>
@@ -693,8 +696,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Type">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Type"/>
                 </search>
             </field>
         </record>
@@ -794,8 +796,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Tax Code">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
                     <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
@@ -881,8 +882,7 @@
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <group>
-                        <field name="name"/>
-                        <field name="description"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>
@@ -1147,6 +1147,8 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1158,15 +1160,11 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
+                        <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                        <separator orientation="vertical"/>
                         <field name="move_id" string="Number (Move)"/>
-                        <field name="date"/>
                         <field name="account_id"/>
-                        <field name="partner_id">
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="partner_id"/>
                         <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
                         <field name="period_id" context="{'period_id':self}"/>
                     </group>
@@ -1392,18 +1390,16 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="partner_id"/>
-                        <field name="date"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>
@@ -1622,17 +1618,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                  <group>
-                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
-                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
-                    <separator orientation="vertical"/>
-                      <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group>
+                        <field name="name" string="Journal Entry Model"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                        <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1715,7 +1712,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -1801,12 +1798,14 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group>
+                        <field name="name" string="Account Subscription"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="model_id"/>
-                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -2072,14 +2071,14 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                        <separator orientation="vertical"/>
                         <field name="parent_id"/>
-                        <field name="type"/>
                         <field name="user_type"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -2140,13 +2139,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                      <group>
-                          <field name="name"/>
+                    <group>
+                        <field name="name" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
-                      </group>
-                      <newline/>
-                      <group expand="0" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
@@ -2155,7 +2155,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
-                      </group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -2262,11 +2262,11 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="description"/>
                         <field name="chart_template_id"/>
                     </group>
                 </search>
@@ -2305,8 +2305,7 @@
             <field name="arch" type="xml">
                 <search string="Search tax template">
                     <group>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
                         <field name="parent_id"/>
                     </group>
                     <newline/>
@@ -2457,7 +2456,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
-                    <field name="name"/>
+                    <field name="name" string="Fiscal Position Template"/>
                 </search>
             </field>
         </record>
@@ -2747,9 +2746,10 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <group>
-                        <field name="name"/>
-                        <field name="type"/>
+                        <field name="name" string="Account Report"/>
+                        <separator orientation="vertical"/>
                         <field name="account_report_id"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b090b7e5609..4f5e86290ee 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <group col="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1f0ec84c5f2..76dccebd1d3 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -30,13 +30,13 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>
@@ -180,16 +180,17 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group>
+                        <field name="name" string="Analytic Line"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                        <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -285,12 +286,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                  <group>
-                      <field name="code"/>
-                      <field name="name"/>
-                      <field name="type"/>
-                  </group>
-                  <newline/>
+                    <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                        <field name="type"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -352,75 +352,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-        #
-        # Statistics [where is this object in py file ?]
-        #
-
-        <!--<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.form</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">form</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Analytic Entries Stats" version="7.0">-->
-        <!--            <group col="4">-->
-        <!--                <field name="name"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--                <field name="journal_id"/>-->
-        <!--            </group>-->
-        <!--        </form>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.tree</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">tree</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <tree string="Analytic Entries Stats">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="account_id"/>-->
-        <!--            <field name="journal_id"/>-->
-        <!--            <field name="quantity"/>-->
-        <!--            <field name="revenue"/>-->
-        <!--            <field name="cost"/>-->
-        <!--        </tree>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.graph</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">graph</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <graph string="Analytic Entries Stats" type="bar">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="cost" operator="+"/>-->
-        <!--            <field name="revenue" operator="+"/>-->
-        <!--            <field group="True" name="journal_id"/>-->
-        <!--        </graph>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.search</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">search</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <search string="Analytic Entries Stats">-->
-        <!--            <group>-->
-        <!--                <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>-->
-        <!--                   <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>-->
-        <!--                   <separator orientation="vertical"/>-->
-        <!--                <field name="name"/>-->
-        <!--                   <field name="month"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--            </group>-->
-        <!--        </search>-->
-        <!--    </field>-->
-        <!--</record>-->
 
         <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 408e76fdcb9..da60b59a8f4 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,37 +34,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
+                <group>
+                    <field name="day" string="Day"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                            name="month"
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 30 days"/>
-                    <filter icon="terp-go-week"
-                            string="    7 Days    "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries during last 7 days"/>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
-                    <field name="user_id">
-                    <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 92906604f63..f2b0cceddc0 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -68,6 +68,10 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_maturity"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"
@@ -95,10 +99,6 @@
                     <field name="partner_id"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
                  </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c464d1cfc46..452bf6d1c34 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -55,19 +55,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -84,25 +73,25 @@
                            help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal" string="Customer"
-                            name="customer"
-                            domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
-                            help="Customer Invoices And Refunds"/>
+                           name="customer"
+                           domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
+                           help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
-                            string="Supplier"
-                            domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Supplier Invoices And Refunds"/>
-                   <separator orientation="vertical"/>
-                   <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"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="user_id" />
-                   <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                           string="Supplier"
+                           domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
+                           help="Supplier Invoices And Refunds"/>
+                    <separator orientation="vertical"/>
+                    <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"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" />
+                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -136,7 +125,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 587d068ca1b..c9c667ae70e 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -151,10 +151,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
@@ -217,10 +214,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index eceb1e5c760..a4538a90055 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                 <newline/>
+                <newline/>
             </search>
         </field>
     </record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index a642e531aa8..c3ac5f5b71c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -20,26 +20,22 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group col="8" colspan="4">
+                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
                         <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-                        <filter icon="terp-go-month"
-                             string=" +1 Month"
-                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Analytic Accounts with a past deadline in one month." />
-
                         <separator orientation="vertical"/>
-                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <field name="partner_id">
-                            <filter help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        </field>
-                        <field name="user_id">
-                            <filter help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        </field>
-
+                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index c4e8c16f70a..beb4dcbd34e 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -47,20 +47,20 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
-                    <separator orientation="vertical"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_stop"/>
+                        <separator orientation="vertical"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-						<separator orientation="vertical"/>
-						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
                          <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index cd1467afd9e..045a0eb0cbb 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -196,7 +196,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
-                <field name="name"/>
+                <field name="name" string="Analytic Plan"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 01144c153e5..8efe929e471 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -64,7 +64,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
-                <field name="name"/>
+                <field name="name" string="Asset Category"/>
+                <separator orientation="vertical"/>
                 <field name="journal_id"/>
             </search>
         </field>
@@ -204,12 +205,14 @@
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <group col="10" colspan="12">
+                    <field name="name" string="Asset"/>
+                    <separator orientation="vertical"/>
+                    <field name="purchase_date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_id"/>
-                    <field name="purchase_date"/>
                     <field name="partner_id"/>
                 </group>
             </search>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index c2f931862f5..f06e857cf7a 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,16 +44,8 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="Year" icon="terp-go-year" name="year"
-                        domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Assets purchased in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                        domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in current month"/>
-                    <filter icon="terp-go-month" string="Month-1" separator="1"
-                        domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in last month"/>
+                    <field name="purchase_date"/>
+                    <field name="depreciation_date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                     <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
@@ -63,12 +55,10 @@
                     <separator orientation="vertical"/>
                     <field name="asset_id"/>
                     <field name="asset_category_id"/>
-                    <field name="depreciation_date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
-                    <field name="purchase_date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
@@ -94,7 +84,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs;</field>
     </record>
     
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index d806760a85b..a3185db2c92 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -118,41 +118,42 @@
     </record>
 
     <record id="view_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">bank.statement.line.filter</field>
-      <field name="model">account.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
-            <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
-            <separator orientation="vertical"/>
-            <field name="journal_id"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-          </group>
-          <newline/>
-          <group string="Extended Filters..." expand="0">
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="1">
-            <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">bank.statement.line.filter</field>
+        <field name="model">account.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
+                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group string="Extended Filters..." expand="0">
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="1">
+                    <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index ad780c13bd5..b10469059fd 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -18,8 +18,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
-                    <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -180,17 +179,18 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group>
-                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                       <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="code" />
-                       <field name="state"/>
-                       <field name="date_from"/>
-                       <field name="date_to"/>
-                   </group>
-               </search>
-           </field>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                        <separator orientation="vertical"/>
+                        <field name="state"/>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index f70dae8ffcd..bb2e833ce25 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -7,27 +7,29 @@
 
     <!-- CODA Bank Account Configuration -->
     <record id="view_coda_bank_account_search" model="ir.ui.view">
-      <field name="name">coda.bank.account.search</field>
-      <field name="model">coda.bank.account</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-          <search string="CODA Bank Account Configuration">
-              <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-              <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-              <separator orientation="vertical"/>
-              <field name="name"/>
-              <field name="bank_id"/>
-              <field name="description1"/>
-              <field name="journal"/>
-              <field name="currency" widget="selection"/>
-              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              <newline/>
-              <group expand="0" string="Group By...">
-                <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
-              </group>
-          </search>
-      </field>
+        <field name="name">coda.bank.account.search</field>
+        <field name="model">coda.bank.account</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="CODA Bank Account Configuration">
+                <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
+                    string="CODA Bank Account"/>
+                <separator orientation="vertical"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
+                <separator orientation="vertical"/>
+                <field name="bank_id"/>
+                <field name="journal"/>
+                <field name="currency" widget="selection"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                </group>
+            </search>
+        </field>
     </record>
     <record id="view_coda_bank_account_list" model="ir.ui.view">
       <field name="name">coda.bank.account.list</field>
@@ -382,28 +384,31 @@
     </record>
 
     <record id="view_coda_bank_statement_search" model="ir.ui.view">
-      <field name="name">coda.bank.statement.search</field>
-      <field name="model">coda.bank.statement</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search CODA Bank Statements">
-          <group col="8" colspan="4">
-            <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-            <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
-            <separator orientation="vertical"/>
-            <field name="name"/>
-            <field name="date"/>
-            <field name="period_id"/>
-            <field name="coda_bank_account_id"/>
-            <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-            <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.search</field>
+        <field name="model">coda.bank.statement</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search CODA Bank Statements">
+                <group col="8" colspan="4">
+                    <field name="name"
+                        string="CODA Bank Statement"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                    <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
+                    <separator orientation="vertical"/>
+                    <field name="period_id"/>
+                    <field name="coda_bank_account_id"/>
+                    <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                    <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record model="ir.actions.act_window" id="action_coda_bank_statements">
@@ -471,39 +476,42 @@
     </record>
 
     <record id="view_coda_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">coda.bank.statement.line.filter</field>
-      <field name="model">coda.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-            <field name="type"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Extended Filters...">
-            <field name="coda_bank_account_id"/>
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="0">
-            <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.line.filter</field>
+        <field name="model">coda.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group col='6' colspan='4'>
+                    <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                        string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="coda_bank_account_id"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="type"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="0">
+                    <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_coda_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 89423327d68..c2e89202553 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group>
-                        <field name="name"/>
+                    <group>
+                        <field name="name" string="Followup"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 5ba0e147bf8..9627d12aa88 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -34,41 +34,42 @@
                </graph>
            </field>
       </record>
-	 <record id="view_account_followup_stat_search" model="ir.ui.view">
-        <field name="name">account_followup.stat.search</field>
-        <field name="model">account_followup.stat</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Follow-ups Sent">
-              <group>
-              <filter icon="terp-go-year" string="This Fiscal year"
-			              name="fiscalyear"
-			              domain="[('period_id','in','current_year')]"
+        <record id="view_account_followup_stat_search" model="ir.ui.view">
+            <field name="name">account_followup.stat.search</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Follow-ups Sent">
+                    <group>
+                        <field name="date_move"/>
+                        <field name="date_move_last"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-year" string="This Fiscal year"
+                            name="fiscalyear"
+                            domain="[('period_id','in','current_year')]"
                             help="Follow up Entries with period in current year"/>
-              <separator orientation="vertical"/>
-              <filter icon="terp-camera_test" string="Not Litigation"
-              			   domain="[('blocked','=', False)]"
-                           help = "Including journal entries marked as a litigation"/>
-              <separator orientation="vertical"/>
-              <field name="partner_id"/>
-              <field name="balance" />
-              <field name="date_move" />
-              <field name="date_move_last" />
-              </group>
-              <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
-                    <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
-                </group>
-            </search>
-        </field>
-    </record>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="Not Litigation"
+                            domain="[('blocked','=', False)]"
+                            help = "Including journal entries marked as a litigation"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="balance"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
+                        <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_followup_stat" model="ir.actions.act_window">
             <field name="name">Follow-ups Sent</field>
             <field name="res_model">account_followup.stat</field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 8a592f01ac2..32b6383a8cc 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -36,21 +36,22 @@
                   parent="account.menu_finance_periodical_processing_billing"
                   sequence="10"/>
 
-           <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
+        <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
             <field name="model">account_followup.stat.by.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
-                   <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="max_followup_id"/>
-                   <field name="date_followup"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date_followup"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="max_followup_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
-           </record>
+        </record>
 
        <!-- Screen2 -->
            <record id="account_followup_stat_by_partner_tree" model="ir.ui.view">
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 8e18ec51d5b..e9789b8199e 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -74,7 +74,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Messages">
-                <field name="name"/>
+                <field name="name" string="Message"/>
+                <separator orientation="vertical"/>
                 <field name="msg"/>
             </search>
         </field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e99f552389e..aa4cd18308f 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -47,12 +47,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
-                    <field name="name"/>
+                    <field name="name"
+                        string="Payment Mode"/>
+                    <separator orientation="vertical"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
                 </search>
             </field>
@@ -208,13 +210,16 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <group>
+                        <field name="reference"
+                            string="Payment Order"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_done"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="reference"/>
                         <field name="mode" widget='selection'/>
-                        <field name="date_done"/>
                         <field name="state"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 586d06449c8..6177da71eed 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -123,17 +123,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id"/>
                     </group>
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 9f5e7d78d66..702b65f5fb1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,18 +49,8 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
+                    <field name="date_due"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -81,10 +71,8 @@
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
-                    <field name="pay_now"/>
                     <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
+                    <field name="pay_now"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
@@ -115,7 +103,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_sale_receipt_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ef043891a10..cfed906e431 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,17 +9,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
@@ -42,17 +41,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 739d8efe993..5de7636c0c1 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,21 +8,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <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'}"/>
@@ -40,21 +39,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <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 f21836aeee5..55c55398f4e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -63,17 +63,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Rule"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -170,18 +171,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="user_id"  widget="selection"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Log"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                        <field name="user_id"  widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d33f453c662..da58c54cd73 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,6 +94,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <field name="email" string="Email"/>
+                   <separator orientation="vertical"/>
+                   <field name="event_date"/>
+                   <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        help="Invitations To Review" />
@@ -107,11 +111,9 @@
                        domain="[('state','=', 'delegated')]"
                        help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email"/>
                    <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type"/>
-                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -435,6 +437,8 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
+                           <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                           <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -443,9 +447,6 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" string="Summary"/>
-                           <field name="location" string="Location"/>
-                           <separator orientation="vertical"/>
                            <field name="user_id"/>
                            <separator orientation="vertical"/>
                            <field name="show_as"/>
@@ -465,7 +466,6 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-
                         </group>
                 </search>
             </field>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 231d1956cca..f556b461835 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name"/>
+                <field name="name" string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 53adcd97e16..02025ab5261 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,16 +158,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
+                    <field name="name" string="Calendar"/>
+                    <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index fd3a398845d..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -45,7 +45,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
           <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 93d6053635c..4fa4d778082 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name"/>
+                    <field name="name" string="Stage Name"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -312,6 +313,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                <field name="subjects"/>     
+                <separator orientation="vertical"/>
+                <field name="create_date"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
@@ -324,39 +331,21 @@
                     string="Pending"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Leads" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Leads creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Leads"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
-                </field>
-                <field name="subjects"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}">
-                    <filter icon="terp-personal+"
+                <filter string="Leads Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="section_id" widget="selection"
+                    context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
-                <field name="country_id" context="{'invisible_country': False}">
-                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                </field>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -375,6 +364,15 @@
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
+                <separator orientation="vertical"/>
+                <group string="Display">
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
            </search>
         </field>
     </record>
@@ -567,6 +565,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
                     name="new"
@@ -579,25 +580,20 @@
                     string="Pending"  help="Pending Opportunities"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Opportunities"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
-                </field>
-                <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter icon="terp-personal+"
+               <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="My Sales Team(s)" />
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="country"/>
+                <field name="partner_id"/>
+                <field name="section_id"
+                    context="{'invisible_section': False, 'default_section_id': self}"/>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@@ -614,6 +610,13 @@
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
+                <group string="Display">
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c855fae26cc..85e9864115a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -285,12 +285,14 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter icon="terp-personal"
+                               filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
+                           <separator orientation="vertical"/>
+                           <filter string="My Meetings"
+                                   icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           </field>
+                           <separator orientation="vertical"/>   
+                           <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
                 </search>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index b4e65d9aa0a..e2204d66efc 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -105,7 +105,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'default_state\':\'open\'}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0722a278fb0..966387608ed 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -177,82 +177,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
+               <field name="name" string="Phonecalls"/>
+               <separator orientation="vertical"/>
+               <field name="date"/>
                <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
-        </field>
-    </record>
-    <!-- Scheduled a phonecall search view-->
-    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
-        <field name="name">CRM - Scheduled Calls Search</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Scheduled Phonecalls">
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
+               <filter string="Unassigned Phonecalls"
+                       icon="terp-personal-"
                        domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
+                       help="Unassigned Phonecalls"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls that are assigned to me or to my team(s)" />
+               <separator orientation="vertical"/>
+               <field name="partner_id"/>
+               <field name="user_id"/>
                <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
+                   widget="selection" string="Sales Team"/>
                <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index e89e0c1a8d8..2c62ae2ead3 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,17 +69,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Type for this month" />
-                           <separator orientation="vertical"/>
-                           <field name="section_id"
-                               widget="selection" />
-                           <field name="category2_id"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
+                        <field name="section_id" widget="selection" />
+                        <field name="category2_id"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
@@ -163,13 +158,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Stage for this month" />
-                           <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -238,19 +229,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section, Category and Stage for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-
-                   </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -332,18 +318,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by User for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-                   </group>
+                    </group>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d153eed4714..142d44432f0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -72,17 +72,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
                             name="lead"
                             string="Lead"
@@ -110,18 +99,15 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index c91999319ce..3f28fb8730e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -52,17 +52,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Phone calls made in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Phone calls made in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
@@ -75,17 +64,16 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Phone calls that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 8ca4e4755ee..4b2cf008958 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,6 +39,9 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="country_id"/>
+                    </xpath>
                 </field>
         </record>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index acff477535c..db479343281 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -196,6 +196,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
+                    <field name="name" string="Claims"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
                         help="New Claims" />
@@ -209,14 +211,13 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
+                    <filter string="Unassigned Claims"
+                            icon="terp-personal-"
+                            domain="[('user_id','=', False)]"
+                            help="Unassigned Claims" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                            <filter icon="terp-personal-"
-                                domain="[('user_id','=', False)]"
-                                help="Unassigned Claims" />
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 62beda00c8a..e92102f889d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -54,20 +54,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                       <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Claims created in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Claims created in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in last month"/>
-
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -77,27 +63,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -116,6 +97,7 @@
                         <field name="priority" />
                         <field name="type_action" />
                         <newline/>
+                        <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
                     </group>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index eb7bcade10b..dfe58162d83 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,6 +163,8 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
+                            <field name="name" string="Fund Description"/>
+                            <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
                                 help="New Funds" />
@@ -174,20 +176,19 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <field name="state"/>
-                            <field name="name"
-                                string="Fund Description" />
-                            <field name="user_id"
-                                widget="selection">
-                                <filter icon="terp-personal-"
+                            <filter string="Unassigned"
+                                    icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
-                            </field>
-                            <field name="section_id" widget="selection" string="Sales Team">
-                                <filter icon="terp-personal+"
+                            <filter string="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="My Sales Team(s)" />
-                            </field>
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                            <separator orientation="vertical" />
+                            <field name="state"/>
+                            <field name="user_id" 
+                                widget="selection"/>
+                            <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
@@ -197,14 +198,12 @@
                             <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Category" help="Fund Category"
                                 icon="terp-stock_symbol-selection" domain="[]"
                                 context="{'group_by':'categ_id'}" />
                             <filter string="Payment Mode" help="Payment Mode"
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index afdcf56d50e..5a3ed924567 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -78,19 +78,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Funds raised in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Funds raised in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -100,23 +87,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -128,6 +114,7 @@
                             domain="[('state','=','cancel')]"/>
                         <separator orientation="vertical"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="create_date"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4612fdf20a5..2a004b32d3e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -149,6 +149,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <field name="name" string="Query"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
@@ -163,25 +167,14 @@
                         domain="[('state','=','pending')]"
                         help="All pending Helpdesk Request"
                     />
+                    <filter string="Assigned to Me or My Sales Team(s)"
+                            icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','&gt;=',current_date), ('date','&lt;=',current_date)]"
-                        help="Todays's Helpdesk Requests"
-                        />
-                    <filter icon="terp-go-week"
-                        string="7 Days"
-                        help="Helpdesk requests during last 7 days"
-                        domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                    <separator orientation="vertical"/>
-                    <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My Sales Team(s)" />
-                    </field>
+                    <field name="section_id" widget="selection" string="Sales Team"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index fdf8d5ad0f9..6060c6c1f90 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -54,47 +54,35 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests occurred in current year"/>
-                        <separator orientation="vertical" />
-
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in last month"/>
-                        <separator orientation="vertical" />
                         <filter string="New" icon="terp-check"
                         domain="[('state','=','draft')]" />
                         <filter string="Open" icon="terp-camera_test"
                         domain="[('state','=','open')]" />
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <filter string="My Sales Team(s)"
+                            icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                            icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>   
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
                         <newline/>
+                        <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
                     <newline/>
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 18b31c009ad..a34a9139c3c 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -10,11 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 82919ab02cb..da4b6c2284d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -39,8 +39,8 @@
             <field name="model">document.storage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Document storage">
-                    <field name="name" />
+                <search string="Search Document Storage">
+                    <field name="name" string="Document Storage"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -171,13 +171,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
+                    <field name="name" string="Document Directory"/>
+                    <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" />
-                    <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
+                    <field name="user_id" />
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -291,15 +292,18 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-                <field name="create_uid" position="replace">
-                    <field name="user_id">
-                            <filter icon="terp-personal"
-                                domain="[('user_id','=',uid)]"
-                                help="Filter on my documents" />
-                        </field>
+                <xpath expr="//filter[@name='my_documents_filter']" position="replace">
+                    <filter name="my_documents_filter" 
+                            string="My Document(s)"
+                            icon="terp-personal"
+                            domain="[('user_id','=',uid)]"
+                            help="Filter on my documents"/>
+                </xpath>
+                <xpath expr="//field[@name='create_uid']" position="replace">
+                    <field name="user_id"/>
                     <field name="parent_id" />
                     <field name="index_content"/>
-                </field>
+                </xpath>
             </field>
     </record>
 
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 72167d84751..e688707086a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,16 +41,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group>
+                    <group>
+                        <field name="name"
+                            filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
+                            string="Users File"/>
                         <separator orientation="vertical"/>
-                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-                            <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="month"/>
-                            <field name="user"/>
-                            <field name="directory"/>
-                        </group>
+                        <field name="month"/>
+                    </group>
                </search>
             </field>
         </record>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 8962da0a1f3..404e60588e3 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,8 +38,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
@@ -139,8 +140,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document Property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 7bb86132af9..7b64254dfd8 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -128,13 +128,10 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="email_to"/>
+                        <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
                         <separator orientation="vertical"/>
+                        <field name="model_id"/>
                         <field name="lang"/>
-                        <field name="subject"/>
-                        <field name="report_name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ffb15eb8cb6..ed539e7bf39 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,21 +265,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
+                        <field name="name" string="Events"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Upcoming"
-                                name="upcoming"
-                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Upcoming events from today" />
-                        <field name="name"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <filter icon="terp-go-today" string="Upcoming"
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Upcoming events from today" />
+                        <separator orientation="vertical"/>
+                        <field name="type" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
             <field name="arch" type="xml">
                 <tree string="Registration" >
                     <field name="create_date"/>
+                    <field name="partner_id"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
@@ -448,19 +449,18 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
-                        <field name="user_id">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="origin"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 71d656740fe..7ae6c0fae2e 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,38 +53,21 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter string="Year" icon="terp-go-year" name="year"
-                          domain="[('event_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('event_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                          help="Events happening this year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                          domain="[('event_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happening in current month"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                          domain="[('event_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happened in last month"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new"
-                        string="New"
-                        domain="[('event_state','=','draft')]"
-                        help="Events which are in New state"/>
-                    <filter icon="terp-check"
-                        string="Confirm"
-                        domain="[('event_state','=','confirm')]"
-                        help="Events which are in confirm state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                          string="Confirmed Registrations"
-                          help="Registrations in confirmed or done state"
-                          context="{'no_of_draft_invisible':1}"/>
-                    <separator orientation="vertical"/>
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="New"
+                            domain="[('event_state','=','draft')]"
+                            help="Events which are in New state"/>
+                        <filter icon="terp-check"
+                            string="Confirm"
+                            domain="[('event_state','=','confirm')]"
+                            help="Events which are in confirm state"/>
                         <filter icon="terp-personal"
-                        string="My Events"
-                        help="My Events"
-                        domain="[('user_id','=',uid)]"/>
-                    </field>
+                            string="My Events"
+                            help="My Events"
+                            domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" string="Event"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -92,7 +75,6 @@
                         <field name="event_date"/>
                     </group>
                     <newline/>
-
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -114,6 +96,12 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
+                    <group expand="0" string="Display">
+                        <filter icon="terp-camera_test"
+                              string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state"
+                              context="{'no_of_draft_invisible':1}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7c89babf3da..9567f7746f3 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -79,12 +79,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
+                    <field name="name" string="Incoming Mail Server"/>
+                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..1935cbbd03d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -41,7 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <field name="name"/>
+                    <field name="name" string="Department"/>
+                    <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c5fd64e586c..5915511d385 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -105,20 +105,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="name" string="Employees"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids"/>
                     <field name="parent_id"/>
-                    <newline />
+                    <field name="category_ids"/>
+                    <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                    <separator orientation="vertical" />
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
@@ -410,6 +410,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
+                    <field name="name" string="Job"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"  
                             domain="[('state','=','open')]" 
                             string="In Position"
@@ -417,14 +419,12 @@
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
                         help="In Recruitment"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="department_id" widget="selection"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 92e2a8bcbed..d3047f424ec 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -54,12 +54,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="name" string="Attendance"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
-                    <field name="name"/>
                     <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 142cb6b7667..ab93bd9c0c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,23 +39,22 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
-                   <separator orientation="vertical"/>
-                   <field name="name"/>
-                   <field name="employee_id"/>
-                   <field name="working_hours"/>
-                   <field name="date_start"/>
-                   <field name="date_end"/>
+                       <field name="name" string="Contracts"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
+                       <separator orientation="vertical"/>
+                       <field name="employee_id"/>
+                       <field name="working_hours"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                   <separator orientation="vertical"/>
-                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                       <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                       <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>
@@ -164,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                    <field name="name"/>
+                       <field name="name" string="Contract Type"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 982ea1c4000..90de785a34a 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <group>
-                       <field name="name"/>
+                       <field name="name" string="Appraisal Plans"/>
+                       <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
@@ -227,29 +228,22 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
-                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                        help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
-                    <filter icon="terp-go-month" name="next_month" string=" Month+1" 
-                         domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
-                         help="Appraisal during next month"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id" />
-                    <field name="plan_id" widget="selection" />
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                        <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>
-                    <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
-                    <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -327,9 +321,9 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 753b33fa706..b6f76777f54 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -46,17 +46,6 @@
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
             	<group>
-            		<filter icon="terp-go-year" string="Year"
-                        name="year"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <separator orientation="vertical"/>						
-                    <filter icon="terp-go-month" string=" Month " name="month" 
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " 
-                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Evaluation done in last month"/>
-                    <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
@@ -73,6 +62,7 @@
                     <field name="deadline"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
+                    <field name="create_date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index fd479d84976..703060e792e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -29,6 +29,7 @@
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
@@ -135,22 +136,17 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <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="name" string="Expenses"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
+                      <field name="date"/>
+                      <separator orientation="vertical"/>
+                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id"/>
-                      <field name="date"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                    </field>
-                      <field name="name"/>
-                      <field name="user_id"  string="User">
-                      </field>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
+                      <field name="user_id"  string="User"/>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index e6b51958e1c..1299f4e9ce5 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,23 +53,10 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="Year" name="year"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                      help="Expenses during current year"/>
-                    <separator orientation="vertical"/>					  
-                  <filter icon="terp-go-month" string="Month"
-                      name="month"
-                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " 
-                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                  <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-                    help = "Confirm Expenses"/>
+                      help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
                       help = "Invoiced Expenses"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index edfff777c3e..7db5a41b7e8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,22 +8,17 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
+                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
-                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Leaves during last month"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        </field>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        </field>
+                        <field name="employee_id"/>
+                        <field name="department_id" widget="selection"/>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -357,7 +352,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -423,7 +419,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4770e82481e..03fd4762262 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -93,8 +93,7 @@
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                     </group>
                     <newline/>
                 </search>
@@ -212,8 +211,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -383,13 +382,14 @@
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <group>
+                        <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
                         <field name="employee_id"/>
-                        <field name="name"/>
-                        <field name="date_from"/>
                         <field name="payslip_run_id"/>
                     </group>
                     <newline/>
@@ -464,8 +464,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" string="Salary Rule Categories" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                </search>
             </field>
         </record>
@@ -520,7 +519,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
-                    <field name="name"/>
+                    <field name="name" string="Contribution Registers"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </search>
             </field>
@@ -650,8 +650,8 @@
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <group col="8">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
@@ -691,12 +691,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <field name="name" string="Payslip Batches"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index acc48224afa..e06a43588c4 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -60,10 +60,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                	<newline/>
+                <filter name='done_filter' position="after">
+                    <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                </field>
+                </filter>
             </field>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 112adb9b5fb..3a75b6df7c1 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,6 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 63263d78c9d..f31778b7874 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -192,29 +192,25 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-document-new" string="New" name="filter_new" 
+               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-document-new" string="New" 
                    domain="[('state','=','draft')]"
-                   help="All Initial Jobs"
-               />
-               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
+                   help="All Initial Jobs"/>
+               <filter icon="terp-camera_test" string="In Progress" 
                    domain="[('state','=','open')]"
-                   help="Open Jobs"
-               />
+                   help="Open Jobs"/>
                <filter icon="terp-gtk-media-pause" string="Pending"
                    domain="[('state','=','pending')]"
-                   help="Pending Jobs"
-               />
-               <separator orientation="vertical"/>
+                   help="Pending Jobs"/>
+               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]"
                     help="Filter and view on next actions and date"/>
                <separator orientation="vertical"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
-               </field>
+               <field name="user_id"/>
                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 16281eeb918..5ddbe5045ab 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -50,19 +50,6 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Recruitment performed in current year"/>
-                    <separator orientation="vertical"/>	
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment performed in current month"/>
-                    <filter icon="terp-go-month"
-                        string="    Month-1    "
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment during last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="New"
                         icon="terp-document-new"
                         domain="[('state','=','draft')]"
@@ -71,23 +58,22 @@
                         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="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 orientation="vertical"/>
-                      <field name="job_id"/>
+                        icon="terp-camera_test"
+                        domain="[('state','=','done')]"
+                        help = "Hired employees"/>
+                    <filter icon="terp-personal"
+                        string="My Recruitment"
+                        help="My Recruitment"
+                        domain="[('user_id','=',uid)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible">
-                        <filter icon="terp-personal"
-                            string="My Recruitment"
-                            help="My Recruitment"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id" string="Responsible"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -116,9 +102,7 @@
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
-
-
-                </search>
+            </search>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a9629b40b75..a8a361ed633 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -60,11 +60,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="account_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 8524c762e9e..c45162ecbcb 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -144,7 +144,7 @@
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Type of invoicing"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 2ad2efa60c2..3462f6603c5 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,26 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <filter icon="terp-go-year" string="This Year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet lines in this year"/>
-                      <filter icon="terp-go-month" string="This Month"
-                          name="month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Timesheet lines in this month"/>
-                    <filter icon="terp-go-week"
-                              string="    7 Days    "
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                              help="Timesheet lines during last 7 days"/>
-                      <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection">
-                          <filter icon="terp-personal"
+                      <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
-                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="user_id" widget="selection"/>
                       <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="product_id"/>
+                      <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -162,13 +150,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
+                        <field name="name" string="Timesheet by users"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -298,14 +283,11 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -370,14 +352,11 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index a3976e4bfc6..89d8fa1857e 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,13 +114,11 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
+                        <field name="name" string="Analytic Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="product_id"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="month"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 138a77cf3bf..835b447592f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -155,11 +155,12 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
-                        <field name="date_from"/>
                         <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -226,7 +227,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="date" position="after">
+                <field name="user_id" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>
@@ -242,8 +243,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
-                <field name="action" position="after">
-                    <field name="sheet_id" />
+                <field name="employee_id" position="after">
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 447c3be6966..8b102b19f72 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -41,22 +41,8 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>							
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
-                            <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="user_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -81,7 +67,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 7c06971c7d2..fe497b6f46c 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -49,20 +49,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>								
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                                 string="Draft"
                                 domain="[('state','=','draft')]"/>
@@ -70,11 +56,11 @@
                                 string="Confirmed"
                                 domain="[('state','=','confirm')]"/>
                         <filter icon="terp-dialog-close"
-                                    string="Done"
-                                    domain="[('state','=','done')]"/>
+                                string="Done"
+                                domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="account_id"/>
-                      <field name="user_id" />
+                        <field name="user_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -87,6 +73,7 @@
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <newline/>
+                        <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 10f703101ff..0aabaa42276 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <field name="name"/>
+                <field name="name" string="Category"/>
             </search>
         </field>
     </record>
@@ -108,12 +108,13 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group>
+                    <field name="name" string="Idea"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
                     <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_ids"/>
                 </group>
                 <newline/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index ffd07973546..1777fd85da6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -71,13 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
@@ -183,10 +182,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_cashmove"/>
                     <field name="create_date"/>
+                    <field name="user_cashmove"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
@@ -196,7 +193,6 @@
                         <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
-
             </field>
         </record>
 
@@ -294,7 +290,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
-                    <field name="name" />
+                    <field name="name" string="Product"/>
                     <field name="category_id"/>
                     <field name="price"/>
                 </search>
@@ -370,20 +366,8 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  " name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Box amount in current year"/>
-                    <separator orientation="vertical"/>
-
-                        <filter icon="terp-go-month" string="   Month   "
-                                name="month"
-                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Box amount in current month"/>
-                        <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Box amount in last month"/>
-                    <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 5dd25322d47..168398ae5cc 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -26,17 +26,7 @@
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="    7 Days    "
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Tasks during last 7 days"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index d732f47eba1..0912a3e8762 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
 "X-Generator: Launchpad (build 15461)\n"
 
 #. module: mail
@@ -536,24 +536,3 @@ msgstr "Adresse de réponse préférée pour le message"
 
 #~ msgid "Message headers"
 #~ msgstr "En-têtes de message"
-
-#~ msgid "about a minute ago"
-#~ msgstr "il y a une minute"
-
-#~ msgid "%d minutes ago"
-#~ msgstr "il y a %d minutes"
-
-#~ msgid "a day ago"
-#~ msgstr "il y a un jour"
-
-#~ msgid "%d days ago"
-#~ msgstr "il y a %d jours"
-
-#~ msgid "a month ago"
-#~ msgstr "il y a un mois"
-
-#~ msgid "%d months ago"
-#~ msgstr "il y a %d mois"
-
-#~ msgid "History and Comments"
-#~ msgstr "Historique et commentaires"
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index fd67ac6e79b..921c3b528c4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -99,8 +99,9 @@
             <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <search string="Search groups">
-                    <field name="name"/>
+                <search string="Search Groups">
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 339c8fba817..9159190ab29 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -54,9 +54,11 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
-                    <field name="model"/>
+                    <field name="model" string="Message"/>
+                    <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -168,20 +170,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="email_from"/>
-                    <field name="email_to"/>
-                    <field name="subject"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 26c83f188ab..5633a4bdae0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -206,7 +206,6 @@ openerp.mail = function(session) {
             });
             // see more
             this.$element.on('click','a.oe_mail_msg_more', function (event) {
-                console.log("sadf");
                 $(this).siblings('.oe_mail_msg_tail').show();
                 $(this).hide();
                 return false;
@@ -234,8 +233,6 @@ openerp.mail = function(session) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
                 
-                //build attachments download urls and compute time-relative from dates
-                
                 self.display_comments(records);
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                 else  self.$element.find('div.oe_mail_thread_more:last').hide();
@@ -255,6 +252,8 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
+            
+            //build attachments download urls and compute time-relative from dates
             for (var k in records) {
                 records[k].timerelative = $.timeago(records[k].date);
                 if (records[k].attachments) {
@@ -303,7 +302,7 @@ openerp.mail = function(session) {
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
 
-            // split for see mode
+            // split for see more
             var split = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body_head = split[0];
             record.body_tail = split[1];
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 32f8e5b3a72..aa8ea08217e 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -81,31 +81,31 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.search</field>
-       <field name="model">marketing.campaign</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Campaigns">
-               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="object_id" string="Resource"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.search</field>
+        <field name="model">marketing.campaign</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Campaigns">
+                <field name="name" string="Campaign"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
+                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">Campaigns</field>
@@ -185,34 +185,35 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.segment.search</field>
-       <field name="model">marketing.campaign.segment</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Segments">
-               <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
-               <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="campaign_id"/>
-               <field name="object_id"/>
-               <field name="date_run"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.segment.search</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Segments">
+                <field name="name" string="Segment"/>
+                <separator orientation="vertical"/>
+                <field name="date_run"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">Segments</field>
@@ -382,43 +383,42 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.workitem.search</field>
-       <field name="model">marketing.campaign.workitem</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Marketing Campaign Activities">
-               <group>
-                <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="segment_id"/>
-                <field name="date"/>
+    <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.workitem.search</field>
+        <field name="model">marketing.campaign.workitem</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Campaign Activities">
+                <group>
+                    <field name="res_name" string="Marketing Campaign Activity"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="campaign_id"/>
+                    <field name="segment_id"/>
+                    <field name="object_id"/>
+                    <field name="partner_id"/>
+                    <field name="res_id"/>
+                </group>
                 <newline/>
-                <field name="object_id"/>
-                <field name="res_name"/>
-                <field name="res_id"/>
-                <field name="partner_id"/>
-               </group>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">Campaign Followup</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 19d1c78f896..7b3d848cc8b 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,21 +31,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                   <group>
-                    <filter icon="terp-go-year" name="year"
-                            string="Year"
-                            domain="[('year','=',time.strftime('%%Y'))]"/>
-                    <separator orientation="vertical"/>
-
-                    <filter icon="terp-go-month"
-                            string="Month" name="This Month"
-                            domain="[('month','=',time.strftime('%%m'))]"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-
-                    <filter icon="terp-go-today"
-                            string="Today"
-                            domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
@@ -66,8 +53,8 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
+                    <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 83607c1ecd5..15645294bb7 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
-                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="code"/>
-                   <field name="name"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group  expand='0' string='Group by...'>
-                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
-                       <separator orientation="vertical"/>
-                       <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
-                   </group>
+                    <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="categ_id" widget="selection" operator="child_of"/>
+                    <newline/>
+                    <group  expand='0' string='Group by...'>
+                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -167,26 +167,24 @@
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Membership Partners">
-		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-	          		<separator orientation="vertical"/>
-		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-	          		<separator orientation="vertical"/>
-	                <field name="membership_stop" string="End Membership Date"/>
-	                <field name="membership_start" invisible="1"/>
-	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="8">
-	                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-	              		<separator orientation="vertical"/>
-	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-	                	<separator orientation="vertical"/>
-	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	            	</group>
-	           </search>
+                <search string="Membership Partners">
+                    <field name="membership_start" invisible="1"/>
+                    <field name="membership_stop" string="End Membership Date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                    <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                    <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <group expand="0" string="Group By..." colspan="10" col="8">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 6b3f6a9eb71..51e1f2499b7 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,20 +36,11 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Events created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    "
-                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in last month"/>
+                        <field name="date_from"/>
                         <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8559a679beb..9b1079dc34e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -82,9 +82,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                    <group>
-                       <field name="name"/>
-                       <field name="composition"/>
+                       <field name="name" string="Name"/>
+                       <separator orientation="vertical"/>
                        <field name="group_id"  widget="selection" />
+                       <field name="composition"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -188,10 +189,10 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group>
+                        <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="resource_type"/>
                    </group>
                    <newline/>
@@ -199,7 +200,7 @@
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    </group>
+                   </group>
                </search>
             </field>
         </record>
@@ -287,13 +288,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
+                    <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -392,8 +392,8 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group>
-                         <field name="name"/>
-                         <field name="code" string="Reference"/>
+                         <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                         <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </group>
@@ -779,6 +779,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group>
+                       <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -788,15 +790,12 @@
                        <filter icon="terp-check" string="In Production" name="inprogress"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are currently in production."/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                       <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fa68d1bdcff..eef6c89f702 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -36,7 +36,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
-                    <field name="name"/>
+                    <field name="name" string="Week"/>
+                    <separator orientation="vertical"/>
                     <field name="workcenter_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..5259d060414 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -123,25 +123,26 @@
             <field name="model">mrp.production.workcenter.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <search string="Search Work Orders">
-                        <group>
-                           <filter icon="terp-document-new" string="Draft"
-                               domain="[('state','=','draft')]"/>
-                           <filter icon="terp-check" string="In Progress" name="Current"
-                               domain="[('state','=','startworking')]"/>
-                           <filter icon="terp-gtk-media-pause" string="Pending"
-                               domain="[('state','=','pause')]"/>
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                               domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                               help="Production started late" />
-                           <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="workcenter_id" widget="selection"/>
-                            <field name="production_id" />
-                            <field name="state" />
-                            <field name="date_planned"/>
-                        </group>
+                <search string="Search Work Orders">
+                    <group>
+                        <field name="name" string="Work Orders"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_planned"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-check" string="In Progress" name="Current"
+                            domain="[('state','=','startworking')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending"
+                            domain="[('state','=','pause')]"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                            help="Production started late"/>
+                        <separator orientation="vertical"/>
+                        <field name="workcenter_id" widget="selection"/>
+                        <field name="production_id"/>
+                        <field name="state"/>
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 9b1b022e668..543024b6354 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,24 +47,12 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('year','=',time.strftime('%%Y'))]"
-                                help="Work orders made during current year"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('month','=',time.strftime('%%m'))]"
-                                help="Work orders made during current month"/>
-                        <filter icon="terp-go-week"
-                                string="Month -1"
-                                domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
-                                help="Work orders during last month"/>
-                      <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
                    </group>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 93ad144e16e..10c19eb1585 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -191,16 +191,16 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group>
+                       <field name="name" string="Reair Orders"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                       <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="partner_id"/>
-                       <field name="state" />
+                       <field name="state"/>
                   </group>
                   <newline/>
                   <group expand="0" string="Group By...">
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index db0be0d09f4..1a185fb08f3 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,7 +49,8 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name"/>
+                    <field name="name" string="Multi Company"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
new file mode 100644
index 00000000000..eff5717af2a
--- /dev/null
+++ b/addons/pad_project/i18n/fr.po
@@ -0,0 +1,38 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-22 08:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index e5ade747840..c67fcd0e9fe 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,10 +27,12 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <field name="name" string="Cash Statement"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
-                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <separator orientation="vertical"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
@@ -52,11 +54,13 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" string="Cash Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5f568f10807..003f2023460 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -138,18 +138,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_order"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index a1631ab0203..255af0cdd30 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,23 +35,7 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month" name="This Month"
-                           domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="POS ordered created during current month"/>
-                        <filter icon="terp-go-month"
-                             string="Month -1"
-                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
@@ -59,14 +43,13 @@
                         <filter icon="terp-dolar"
                             string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index b4a2f1e6ecb..afd769692df 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -26,39 +26,21 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Point of Sale Cash Register Analysis">
-                  <group>
-                      <filter icon="terp-go-year" string="Year" name="year"
-                          domain="[('year','=',time.strftime('%%Y'))]"
-                          help="Cash Analysis created during this year"/>
-                      <separator orientation="vertical"/>
-
-                      <filter icon="terp-go-month" string="Month" name="This Month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Cash Analysis created in current month"/>
-                      <filter icon="terp-go-month"
-                           string="Month -1"
-                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Cash Analysis created in last month"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>
-                      <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                            string="Draft"
-                            domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
+                <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new"
+                        string="Draft"
+                        domain="[('state','=',('draft'))]"/>
+                    <filter icon="terp-camera_test"
                           string="Confirm"
                           domain="[('state','=',('confirm'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection">
-                        <filter icon="terp-personal"
+                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        </field>
+                    <separator orientation="vertical"/>
+                    <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 7a456fc2d89..fe88f61bd98 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -110,7 +110,8 @@
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Process"/>
+                        <separator orientation="vertical"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
@@ -209,7 +210,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Node"/>
+                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
@@ -301,9 +303,10 @@
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Transition"/>
+                    <separator orientation="vertical"/>
                     <field name="source_node_id"/>
-                    <field name="target_node_id" />
+                    <field name="target_node_id"/>
                 </group>
 <!--
                 <newline/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c9a6d55c9d4..547cbb64730 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -106,17 +106,18 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group>
+                       <field name="origin" string="Procurement"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_planned"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
                        <separator orientation="vertical"/>
-                       <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
@@ -186,7 +187,8 @@
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Reordering Rules"/>
+                        <separator orientation="vertical"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index bd0693f0a8c..0492881d9bd 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -112,9 +112,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
-                    <field name="name" />
-                    <field name="type"/>
+                    <field name="name" string="Products Price"/>
+                    <separator orientation="vertical"/>
                     <field name="currency_id"/>
+                    <field name="type"/>
                     <field name="active" />
                 </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce95cc8a044..506688e0a2b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,16 +9,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
+                   <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
-                   <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
-                   <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <separator orientation="vertical" groups="base.group_multi_company" />
@@ -300,8 +298,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
+                    <field name="name" string="Product Categories"/>
+                    <separator orientation="vertical"/>
                     <field name="parent_id"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 879716c18e8..15752d2a486 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -123,26 +123,24 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                       <field name="complete_name" string="Project Name"/> 
+                       <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template"
-                            name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <separator orientation="vertical"/>
+                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                        <separator orientation="vertical"/>
-                       <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager">
-                            <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       </field>
+                       <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
-                         <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                    </group>
+                   <group expand="0" string="Group By...">
+                       <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -582,20 +580,19 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <field name="name" string="Tasks"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id" invisible="1"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                            help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id"/>
-                        <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -689,11 +686,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
-                   <group>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    <group>
+                       <field name="name" string="Tasks Stages"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
-                   </group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index c85b1ba28e5..69daeefc758 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,26 +55,18 @@
             <field name="arch" type="xml">
                <search string="Task's Analysis">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-1" name="month1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-2" name="month2"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=2)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=2)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="project_id"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 659e5bd0651..a5711239f87 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -62,19 +62,9 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-                                help="Current Year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Current Month"/>
-                        <filter icon="terp-go-week"
-                                string="Month-1"
-                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Previous Month"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
                         <filter string="New"
                                 icon="terp-document-new"
@@ -84,32 +74,29 @@
                                 icon="terp-check"
                                 domain="[('state', '=' ,'open')]"
                                 help = "In progress tasks"/>
-                           <filter string="Pending"
-                                   icon="terp-gtk-media-pause"
-                                   domain="[('state','=','pending')]"
-                                   help = "Pending tasks"/>
-                          <filter string="Done"
+                        <filter string="Pending"
+                                icon="terp-gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help = "Pending tasks"/>
+                        <filter string="Done"
                                 icon="terp-dialog-close"
                                 name="done"
                                 domain="[('state','=','done')]"/>
-                       <separator orientation="vertical"/>
-                        <field name="project_id">
-                            <filter icon="terp-folder-violet"
-                                    string="My Projects"
-                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                          </field>
-
-                          <field name="user_id" widget="selection">
-                            <filter icon="terp-personal"
-                                    string="My Task"
-                                    help = "My tasks"
-                                    domain="[('user_id','=',uid)]" />
-                            <filter icon="terp-personal-"
-                                    string="Non Assigned Tasks to users"
-                                    help="Non Assigned Tasks to users"
-                                    domain="[('user_id','=',False)]"/>
-                          </field>
-                      <field name="partner_id" />
+                        <filter icon="terp-folder-violet"
+                                string="My Projects"
+                                help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                                string="My Task"
+                                help = "My tasks"
+                                domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-personal-"
+                                string="Non Assigned Tasks to users"
+                                help="Non Assigned Tasks to users"
+                                domain="[('user_id','=',False)]"/>
+                         <separator orientation="vertical"/>
+                         <field name="project_id"/>
+                         <field name="user_id" widget="selection"/>
+                         <field name="partner_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -117,12 +104,6 @@
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index c8e87093c0e..5b48f6b4648 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -111,26 +111,15 @@
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
+                <field name="name" string="My Tasks"/>
+                <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                <separator orientation="vertical"/>
-                <filter
-                    domain="[('timebox_id','=', False)]"
-                    help="Tasks having no timebox assigned yet" string="Inbox"/>
-                <separator orientation="vertical"/>
-                <separator name="gtdsep"/>
-                <field name="name"/>
-                <field name="context_id" widget="selection"
-                    context="{'context_show': True}">
-                    <filter string="Show Context"
-                        name="context_show"
-                        context="{'context_show': True}"
-                        domain="[]" icon="terp-camera_test"
-                        help="Show the context field"/>
-                    <filter string="Show Deadlines" context="{'deadline_visible': False}"
-                        domain="[]" help="Show only tasks having a deadline"
-                        icon="terp-gnome-cpu-frequency-applet+"/>
-                </field>
+                <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+                <group expand="0" string="Display">
+                    <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
+                    <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 4c3be9e1327..8044d149901 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,6 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f0055f9e33e..0cbde2a2020 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -10,7 +10,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
-                    <field name="name"/>
+                    <field name="name" string="Issue Version"/>
+                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -152,15 +153,16 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        </field>
+                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id"/>
+                        <separator orientation="vertical"/>
                         <field name="id"/>
                     </group>
                     <newline/>
@@ -304,17 +306,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
-                    <separator orientation="vertical"/>
                     <group>
                         <field name="name" string="Feature description"/>
-                        <field name="user_id"/>
-                        <field name="state" groups="base.group_no_one">
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id" string="Project"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 43a49abf2b8..862f52b1931 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,36 +52,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter string="Year" icon="terp-go-year" help="Current Year"
-                        name="year"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />
-                        <separator orientation="vertical" />
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
+                   <group>
+                        <field name="creation_date"/>
                         <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
                             string="New"
                             domain="[('state','=','draft')]"/>
                         <filter  icon="terp-check"
                             string="To Do"
-                            domain="[('state','=','open')]"/>                            
-                       <filter icon="terp-gtk-media-pause"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                       <filter icon="terp-dialog-close"
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
-                           <separator orientation="vertical" />
-
+                          <separator orientation="vertical" />
                           <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="user_id" widget="selection"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
@@ -119,8 +107,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
-
-                  </group>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9ae945676b8..419c89cb449 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
+                       <field name="user_id"/>
+                       <field name="phase_id"/>
+                       <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -273,18 +273,19 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
+                        <field name="name" string="Project Phases"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+                        <field name="project_id"/>
                     </group>
-                    <newline/>
+                    <newline/> 
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 901f4b4c92b..0acf639b507 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -48,8 +48,7 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                   <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
@@ -59,9 +58,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                     <field name="account_id" position="replace">
-                    <field name="account_id" string="Analytic account/project" />
-                </field>
+                 <field name="account_id" position="replace">
+                     <field name="account_id" string="Analytic account/project"/>
+                 </field>
             </field>
          </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index b1ba9b8672e..66633fe8ad8 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -29,33 +29,20 @@
             <field name="model">report.timesheet.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks by User">
-            		<group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Task Hours in current year"/>
+                <search string="Tasks by User">
+                    <group>
+                        <field name="name" string="Date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task Hours in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>
-	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
-                	</group>
-                	<newline/>
-                	<group expand="1" string="Group By...">
-                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
-            	</search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 92bb95fff49..7d8c7edbbad 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
 "X-Generator: Launchpad (build 15461)\n"
 
 #. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 24b789795ed..0d39f9b7388 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -225,27 +225,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
                     <field name="name" string="Reference"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
+                    <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -258,27 +257,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"  help="Approved purchase orders"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -332,7 +330,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_approved': 1}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
@@ -456,9 +454,9 @@
                     <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
-                        <field name="partner_id"  string="Supplier"/>
+                        <field name="partner_id" string="Supplier"/>
                     </group>
-                        <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <separator orientation="vertical"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2837b5e7ab6..4cf91053666 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,32 +53,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group>
-                <filter icon="terp-go-year" string="Year"
-                name="year"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                help="Order in current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Order in  current month"/>
-                <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Order in last month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        name="quotes"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-gtk-jump-to-rtl"
-                        string="Orders"
-                        name="orders"
-                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <separator orientation="vertical"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
+                <group>
+                    <filter icon="terp-document-new"
+                            string="Quotations"
+                            name="quotes"
+                            domain="[('state','=','draft')]"/>
+                    <filter icon="terp-gtk-jump-to-rtl"
+                            string="Orders"
+                            name="orders"
+                            domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 2d126faa9b9..df6ba9531f3 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,22 +65,20 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <group col="8" colspan="4">
+                        <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available"
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                         <filter icon="terp-dialog-close" name="done" string="Received"
                             domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders"
                             domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>                    
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <separator orientation="vertical"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 7d5c6ee4b79..9aa8265628b 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -124,13 +124,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group>
+                    <field name="name" string="Purchase Requisition"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index b069fd159ee..c481296196c 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,13 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
                         <field name="intrastat_id"/>
+                        <field name="month"/>
                         <field name="type"/>
                     </group>
                 </search>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4da1a465c42..20c1251c771 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,12 +11,13 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group>
+                       <field name="name" string="Resource"/>
+                       <separator orientation="vertical"/>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="user_id" string="User"/>
-                       <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -39,7 +40,8 @@
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <group>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Working Time"/>
+                       <separator orientation="vertical"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -55,6 +57,7 @@
                 <search string="Search Working Period Leaves">
                    <group>
                        <field name="name" string="Reason"/>
+                       <separator orientation="vertical"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index e5111ca8d5e..8eb4fc85ce6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,18 +51,8 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Sales order created in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Sales order created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Sales order created in last month"/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
@@ -70,28 +60,23 @@
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
+                    <filter icon="terp-personal"
+                        string="My Sales"
+                        help="My Sales"
+                        domain="[('user_id','=',uid)]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index cf82e7ad59f..0238f28d4da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -288,18 +288,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <separator orientation="vertical"/>
-                    <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
-                    <field name="project_id" groups="sale.group_analytic_accounting"/>
-                    <field name="user_id">
-                        <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
-                    </field>
+                    <field name="user_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -457,13 +454,12 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -483,16 +479,14 @@
                 <search string="Search Uninvoiced Lines">
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 60ef80db245..8a5f56181c2 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -35,13 +35,15 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)"/>
-                    </field>
-                </field>
+                <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
+                        domain="[('section_id.user_id','=',uid)]"
+                        help="My Sales Team(s)"/>
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id" widget="selection" string="Sales Team"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 05c46fb2618..f46b4e56ac7 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,12 +8,12 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@class='oe_subtotal_footer']" position="inside">
+            <xpath expr="//group[@name='sale_total']" position="inside">
                 <field name="margin"/>
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line">
         <field name="name">sale.order.line.margin.view.form</field>
         <field name="type">form</field>
@@ -25,7 +25,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_form">
         <field name="name">sale.order.line.tree.margin.view.form</field>
         <field name="type">form</field>
@@ -37,7 +37,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_tree">
         <field name="name">sale.order.margin.view.tree</field>
         <field name="type">tree</field>
@@ -49,7 +49,7 @@
             </field>
         </field>
     </record>
-   
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
         <field name="name">sale.order.margin.line.view.tree</field>
         <field name="type">tree</field>
@@ -60,7 +60,7 @@
                 <field name="margin"/>
             </field>
         </field>
-    </record>    
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 52e154c1667..defbc522340 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,11 +7,13 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/field[@name='company_ids']" position="after">
-                    <field name="share">
-                        <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                <xpath expr="//field[@name='name']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                </xpath>
+                <xpath expr="//field[@name='company_ids']" position="after">
+                    <field name="share"/>
                 </xpath>
             </field>
         </record>
@@ -29,11 +31,12 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name"/>
-                    <field name="share">
-                        <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="share"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index d276948d244..00201cf4959 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-22 03:36+0000\n"
+"PO-Revision-Date: 2012-06-24 02:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Launchpad-Export-Date: 2012-06-24 05:28+0000\n"
 "X-Generator: Launchpad (build 15461)\n"
 
 #. module: stock
@@ -177,7 +177,7 @@ msgstr "単位"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Physical Inventories"
-msgstr "物理的な在庫目録"
+msgstr "実在庫"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0 view:report.stock.move:0
@@ -290,7 +290,7 @@ msgstr "処理する製品"
 msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
-msgstr "チェックすると、全製品数量は実際の物理在庫を確認するためにゼロに設定されます。"
+msgstr "チェックすると、全製品数量は実際の実在庫を確認するためにゼロに設定されます。"
 
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
@@ -580,38 +580,38 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "棚卸制御"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "追加情報"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr ""
+msgstr "場所 / 製品"
 
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address "
-msgstr ""
+msgstr "宛先住所 "
 
 #. module: stock
 #: code:addons/stock/stock.py:1333
 #, python-format
 msgid "Reception"
-msgstr ""
+msgstr "受理"
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "追加参照"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "製造ロットのリビジョン"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -621,11 +621,13 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"在庫仕訳帳システムは、実行のための操作のタイプ、または操作を実行しなければならない作業者 / "
+"チームによる特定の仕訳帳に各在庫操作を割り当てることができます。在庫仕訳帳の例：品質管理、集荷リスト、梱包など"
 
 #. module: stock
 #: field:stock.location,complete_name:0 field:stock.location,name:0
 msgid "Location Name"
-msgstr ""
+msgstr "場所名"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_shop0
@@ -652,16 +654,18 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"内部出荷は仕入先から受領する全てのオーダーのリストです。内部出荷は元となる発注オーダーにより受領する製品のリストを含みます。合計あるいは一部の出荷の検証が"
+"できます。"
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "親ウィザード（既存行）"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Move Information"
-msgstr ""
+msgstr "移動情報"
 
 #. module: stock
 #: code:addons/stock/stock.py:2131
@@ -674,41 +678,41 @@ msgstr "製品分類で定義された在庫評価アカウントがありませ
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr ""
+msgstr "出庫"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.model,name:stock.model_stock_tracking
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
 msgid "Packs"
-msgstr ""
+msgstr "梱包"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "違う製品のロットを割り当てることはできません。"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "受注と発注"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr ""
+msgstr "調達場所"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -717,28 +721,28 @@ msgstr ""
 #: field:stock.inventory.line.split,line_ids:0
 #: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
 msgid "Production Lots"
-msgstr ""
+msgstr "製造ロット"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr ""
+msgstr "受取人"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "冷蔵庫"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr ""
+msgstr "場所の構造"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -755,23 +759,23 @@ msgstr "リアルタイム在庫評価を行う場合、これは在庫移動が
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "集荷処理"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "参照は会社ごとに固有でなければいけません。"
 
 #. module: stock
 #: code:addons/stock/product.py:417
 #, python-format
 msgid "Future Receptions"
-msgstr ""
+msgstr "将来の受取"
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "緊急"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -779,86 +783,86 @@ msgstr ""
 msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
-msgstr ""
+msgstr "以下のリストの既存ロットを選択するためにはこのオプションをチェックします。そうでない場合、１行ずつ新しく入力する必要があります。"
 
 #. module: stock
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "製品分類のための検証アカウントが定義されていません：%s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "目的地への移動"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Process Now"
-msgstr ""
+msgstr "すぐに処理"
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "場所の住所"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr ""
+msgstr "製造ロットは製造のシリアル番号をつけるために使用されます。"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr ""
+msgstr "場所の入力"
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr ""
+msgstr "定期（手動）"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "調達"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr ""
+msgstr "IT仕入先"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr ""
+msgstr "実在庫のドラフト"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "会社間転送の中継場所"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "自動移動"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "製品数量の変更"
 
 #. module: stock
 #: field:report.stock.inventory,month:0
 msgid "unknown"
-msgstr ""
+msgstr "不明"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -882,60 +886,60 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr ""
+msgstr "スクラップ"
 
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr ""
+msgstr "含む"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr ""
+msgstr "在庫場所"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "入庫"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "梱包の検索"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "梱包は既に処理済です。"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
 #: field:stock.partial.picking.line,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "通貨"
 
 #. module: stock
 #: view:stock.picking:0 report:stock.picking.list:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: stock
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "%s 予定済"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -944,6 +948,8 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"完成した製品を必要とされる場所で製造する場合は空のままとして下さい。固定の場所で製造する場合は場所を設定して下さい。製造業務を外注する場合は、パートナの場"
+"所として下さい。"
 
 #. module: stock
 #: view:res.partner:0
@@ -953,101 +959,101 @@ msgstr "在庫属性"
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "実行リードタイム（日数）"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "部分移動処理ウィザード"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr ""
+msgstr "場所別の在庫"
 
 #. module: stock
 #: help:stock.move,address_id:0
 msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
-msgstr ""
+msgstr "具体的には割当のために使用する、商品が配達されるオプションの住所"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
-msgstr ""
+msgstr "アクティブな項目のチェックを外すことで、場所を削除することなしに非表示にできます。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
 #, python-format
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
-msgstr ""
+msgstr "リストビューで統合するための複数の実在庫を選択して下さい。"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "確認済集荷"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "事実上の在庫"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr ""
+msgstr "ビュー"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Last month"
-msgstr ""
+msgstr "先月"
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "左親"
 
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "在庫評価アカウント"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "待機中"
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: stock
 #: code:addons/stock/product.py:147
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr ""
+msgstr "この製品のために定義された在庫出力アカウントがありません：%s（ID:%d）"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr ""
+msgstr "製造場所"
 
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr ""
+msgstr "パートナの住所"
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1081,27 +1087,42 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"・ 仕入先の場所：仕入先から来る製品のための元の場所を表す仮想の場所\n"
+"                      \n"
+"・ 表示：子の場所を集約し倉庫のための階層的な構造を作るために使用される「仮想の場所。直接製品を含むことはできません。\n"
+"                      \n"
+"・ 内部の場所：自身の倉庫の内側の物理的な場所\n"
+"                      \n"
+"・ 顧客の場所：顧客に製品を送るための宛先の場所を表す仮想の場所\n"
+"                      \n"
+"・ 在庫：在庫レベル（実在庫）を修正するために使用される在庫操作に対応して提供される仮想の場所\n"
+"                      \n"
+"・ "
+"調達：元（仕入先または製造）が未定の時、調達操作に対応した一時的に提供されrる仮想の場所。調達スケジューラの実行を終えた時にこの場所は空にされます。\n"
+"                      \n"
+"・ 製造：製造操作に対応する仮想の場所：この場所は原材料を消費し完成品を製造します。\n"
+"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "著者"
 
 #. module: stock
 #: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr ""
+msgstr "配達オーダー"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "手動操作"
 
 #. module: stock
 #: view:stock.location:0 view:stock.move:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: stock
 #: code:addons/stock/stock.py:2727
@@ -1109,12 +1130,12 @@ msgstr ""
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
-msgstr ""
+msgstr "この棚卸をキャンセルするためには、最初に関連する仕訳帳エントリーを未記帳にする必要があります。"
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr ""
+msgstr "完了日"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:148
@@ -1122,42 +1143,42 @@ msgstr ""
 msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
-msgstr ""
+msgstr "%s %s を出荷するために単位の丸めは許されていません。%s %s の丸めのみが許されています。"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "利用可能な在庫移動（処理準備完了）"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr ""
+msgstr "予定出荷日"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
 #: model:ir.model,name:stock.model_stock_inventory_line_split
 #: view:stock.inventory:0 view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr ""
+msgstr "分割在庫行"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr "物理在庫(棚卸)"
+msgstr "実在庫"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
-msgstr ""
+msgstr "連鎖移動を含む集荷リストが属する会社（デフォルトの会社の決定ルールを使用する場合は空白のままとします）"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1165,54 +1186,54 @@ msgid ""
 "Shipping Type of the Picking List that will contain the chained move (leave "
 "empty to automatically detect the type based on the source and destination "
 "locations)."
-msgstr ""
+msgstr "連鎖移動を含む集荷リストの出荷タイプ（元の場所と到着場所を元にタイプを自動検出する場合は空白のままとします）"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr ""
+msgstr "ロット番号"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "製品単位"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr ""
+msgstr "パートナの場所"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Current year"
-msgstr ""
+msgstr "今年"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total quantity"
-msgstr ""
+msgstr "合計数量"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr ""
+msgstr "移動の消費"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr ""
+msgstr "ヨーロッパの顧客"
 
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr ""
+msgstr "オリジナルの移動と連鎖移動の遅延日数"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "次の場所から現在の製品在庫をインポート"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1223,11 +1244,14 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"連鎖の場所のタイプを選択した時のみに使用されます。\n"
+"自動移動であれば、現在の在庫が自動的に検証された後で在庫移動を作成します。手動操作であれば、在庫移動は作業者が検証する必要があります。自動段階的追加なしで"
+"あれば場所はオリジナルの移動に置き換えられます。"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "梱包の識別"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1337,7 +1361,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr ""
+msgstr "製造ロットのリビジョン"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1444,7 +1468,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "在庫の場所の概観"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1454,7 +1478,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "将来の移動を含む分析（事実上の在庫に類似）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1693,6 +1717,8 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
+"リアルタイム在庫評価を行う場合、宛先場所に特定の評価アカウントのセットがある場合を除き、全ての出荷在庫移動に対応する仕訳帳項目がこのアカウントに記帳されま"
+"す。製品に設定されていない場合は製品分類のものが使用されます。"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1816,6 +1842,8 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"リアルタイム在庫評価のために使用されます。仮想の場所（非内部タイプ）に設定されている場合、このアカウントは製品にセットされる一般的な在庫出力アカウントの代"
+"わりに、内部の場所からこの場所に移動される製品の価値を保持するために使用されます。"
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -1830,7 +1858,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0 field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr ""
+msgstr "在庫評価"
 
 #. module: stock
 #: view:stock.move:0
@@ -1861,6 +1889,7 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"移動分析は会社の在庫移動を簡単にチェックし分析することができます。製品と在庫管理の成績による異なる経路を分析することを望む場合はこのレポートを使用します。"
 
 #. module: stock
 #: code:addons/stock/stock.py:2116
@@ -1888,7 +1917,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr ""
+msgstr "在庫の検索"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
@@ -1926,7 +1955,7 @@ msgstr ""
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "在庫のインポート"
 
 #. module: stock
 #: field:stock.incoterms,name:0 field:stock.move,name:0
@@ -1953,7 +1982,7 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
-msgstr ""
+msgstr "棚卸を行う時に、在庫移動のための元の場所が生成されるため、現在の製品のためにデフォルトの代わりにこの在庫場所が使用されます。"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -1989,7 +2018,7 @@ msgstr ""
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr ""
+msgstr "在庫場所"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -2001,7 +2030,7 @@ msgstr ""
 msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
-msgstr ""
+msgstr "連鎖タイプが透明でない場合（空のままの時は仕訳帳は使用されません）、連鎖移動の中の在庫仕訳帳が書かれます。"
 
 #. module: stock
 #: view:stock.move:0
@@ -2012,7 +2041,7 @@ msgstr ""
 #: view:report.stock.inventory:0
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
-msgstr ""
+msgstr "現在在庫の分析（既に処理された移動のみ）"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2075,7 +2104,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr ""
+msgstr "棚卸損失"
 
 #. module: stock
 #: code:addons/stock/stock.py:1341
@@ -2268,7 +2297,7 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr ""
+msgstr "リビジョン"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2284,6 +2313,8 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"製品のリアルタイム評価が有効な場合、システムは在庫移動に対応して仕訳帳エントリーを自動的に書き込みます。製品分類に設定された在庫の変動アカウントは現在の在"
+"庫価値を表しています。そして、在庫入力と在庫出力のアカウントは製品の入庫や出庫に対応する動きを保持します。"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2292,6 +2323,8 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"在庫分析は会社の在庫レベルを容易にチェックし管理することができます。会社の活動をより良く分析し管理するために選択基準による並べ替えやグループ化を行って下さ"
+"い。"
 
 #. module: stock
 #: help:report.stock.move,location_id:0 help:stock.move,location_id:0
@@ -2340,7 +2373,7 @@ msgstr ""
 #: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
 #: selection:stock.location,usage:0
 msgid "Inventory"
-msgstr ""
+msgstr "在庫"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
@@ -2356,7 +2389,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr ""
+msgstr "棚卸のキャンセル"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -2558,7 +2591,7 @@ msgstr ""
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "全在庫"
 
 #. module: stock
 #: constraint:product.template:0
@@ -2586,7 +2619,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2697
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "棚卸 %s は完了しました。"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2676,7 +2709,7 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "棚卸参照"
 
 #. module: stock
 #: code:addons/stock/stock.py:1334
@@ -2702,7 +2735,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr ""
+msgstr "リビジョン名"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -2714,7 +2747,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr ""
+msgstr "棚卸確認"
 
 #. module: stock
 #: view:product.category:0
@@ -2784,7 +2817,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "在庫分析"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2944,6 +2977,9 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"内部移動は倉庫内で実行する必要がある全ての在庫操作を表示します。各作業者は彼自身の仕訳帳の中に彼自身の実行するための操作のリストを持つので、全ての操作は在"
+"庫仕訳帳の中に分類されます。ほとんどの操作は、あなたが前もって設定した物流ルールにしたがって、OpenERPにより自動的に準備されます。とはいえ、手動で在"
+"庫操作を記録することもできます。"
 
 #. module: stock
 #: view:stock.move:0
@@ -3000,7 +3036,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "事実上の在庫"
 
 #. module: stock
 #: view:product.product:0 view:stock.inventory.line.split:0
@@ -3076,7 +3112,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "棚卸のロット"
 
 #. module: stock
 #: view:stock.move:0
@@ -3138,6 +3174,8 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"リアルタイム在庫評価を行う場合、特定の評価アカウントが宛先場所に設定されていない限り、全ての出荷在庫移動に対応する仕訳帳項目はこのアカウントに記帳されます"
+"。これはこの分類の全ての製品のためのデフォルト値です。これは各製品に直接セットすることができます。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3233,7 +3271,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr ""
+msgstr "改訂日"
 
 #. module: stock
 #: view:board.board:0
@@ -3420,7 +3458,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr ""
+msgstr "在庫棚卸行"
 
 #. module: stock
 #: view:stock.move:0
@@ -3480,6 +3518,7 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
+"このメニューは特定の製品の在庫操作の全ての追跡能力を提供します。製品のための全ての過去および未来の移動を見るために製品をフィルタすることができます。"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3489,7 +3528,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "棚卸の検証"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3502,7 +3541,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Stock Inventory is already Validated."
-msgstr ""
+msgstr "在庫棚卸は既に検証済です。"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
@@ -3552,7 +3591,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "在庫棚卸"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3744,6 +3783,8 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"リアルタイム在庫評価を行う場合、特別な評価アカウントが元の場所に設定されていない限り、全入庫の移動のための対応する仕訳帳項目はこのアカウントに記帳されます"
+"。製品に設定されていない場合、製品分類のものが使用されます。"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 7fbecedd00b..89cbd9c1340 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -57,37 +57,21 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="Year"
-                    name="year"
-                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                    help="Current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                    name="month"
-                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                    help="Current month"/>
-                <filter icon="terp-go-month"
-                    string="Month-1"
-                    name="month-1"
-                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                     help="Last month"/>
-                <separator orientation="vertical"/>
-                <filter string="Done"
-                    name="done"
-                    icon="terp-dialog-close"
-                    domain="[('state','=','done')]"
-                    help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                    icon="terp-gtk-go-back-rtl"
-                    domain="[('state','in',('assigned','waiting','confirmed'))]"
-                    help = "Future Stock-Moves"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <filter string="Done"
+                        name="done"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help = "Completed Stock-Moves"/>
+                    <filter string="Todo"
+                        icon="terp-gtk-go-back-rtl"
+                        domain="[('state','in',('assigned','waiting','confirmed'))]"
+                        help = "Future Stock-Moves"/>
+                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -180,33 +164,15 @@
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
-                        name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current month"/>
-                    <filter icon="terp-go-month"
-                        string="Month-1"
-                        name="month-1"
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-
                     <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-
-                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id" default_focus="1"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 51236e47962..69a7829f565 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -34,16 +34,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
-                    <field name="date"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d0db8194331..d2a7c2d90b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,8 +78,10 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
@@ -283,9 +285,10 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
@@ -390,13 +393,13 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -552,6 +555,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
@@ -559,7 +564,6 @@
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -875,12 +879,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
@@ -940,6 +944,7 @@
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
@@ -987,16 +992,14 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1101,15 +1104,13 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
@@ -1291,17 +1292,18 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
@@ -1477,13 +1479,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1508,13 +1510,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1703,7 +1705,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
index c7bf2f10df8..399d5b0139b 100644
--- a/addons/stock_no_autopicking/i18n/ja.po
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
 "X-Generator: Launchpad (build 15461)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 05b3c5a213f..60f8127165f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,12 +50,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <field name="name" string="Stock Periods"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
             </field>
         </record>
@@ -198,6 +199,7 @@
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
@@ -304,6 +306,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index c2cffdc1bfa..e02ce3d07dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,15 +74,14 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
+                        <field name="name" string="Subscription"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_init"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check"
-                        string="Running"
-                        domain="[('state','=','running')]"/>
+	                        string="Running"
+	                        domain="[('state','=','running')]"/>
                         <separator orientation="vertical"/>
-                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-today" string="Today"
-                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
@@ -169,7 +168,8 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Subscription Document"/>
+                        <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
                 </search>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 1e8fd5c9e2c..c50613f466b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,14 +258,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="title" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         <separator orientation="vertical"/>
-                        <field name="title"/>
                         <field name="type" widget="selection"/>
-                        <field name="responsible_id">
-                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
-                        </field>
+                        <field name="responsible_id"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -473,7 +473,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title"/>
+                    <field name="title" string="Page"/>
+                    <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -678,7 +679,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question"/>
+                    <field name="question" string="Question"/>
+                    <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
@@ -1100,14 +1102,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="email" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection"/>
-                        <field name="email"/>
-                        <field name="user_id">
-                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/users_ldap/i18n/sv.po b/addons/users_ldap/i18n/sv.po
new file mode 100644
index 00000000000..47cd3c95ec1
--- /dev/null
+++ b/addons/users_ldap/i18n/sv.po
@@ -0,0 +1,176 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-23 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-24 05:28+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP-konfiguration"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP-binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Skapa användaren om den saknas i databasen"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Klass som används för att skapa användaren"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP serveradress"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP serverport"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP-bas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Användarinformation"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Processparameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Nummerserie"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Inloggningsuppgifter"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Ställ in din LDAP-server"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP-parametrar"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP-lösenord"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallanvändare"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP-filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Skapa användare"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1dc8b4cdb1f..8069de21d04 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -164,14 +164,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
+                        string="Wiki"/>
+                    <separator orientation="vertical"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="group_id"/>
-                    <field name="tags"/>
-                    <field name="section"/>
                     <field name="write_uid"/>
-                    <field name="write_date" groups="base.group_no_one"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>