From 2fa5b4c96d1bf9caa4274bdba3973622f43db159 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:21:36 +0530
Subject: [PATCH 1/4] [IMP] account:improved all search views

bzr revid: tpa@tinyerp.com-20120719105136-r1y1o5uq7es6mwkj
---
 addons/account/account_invoice_view.xml       |  32 +-
 addons/account/account_view.xml               | 364 +++++++-----------
 addons/account/project/project_view.xml       |  50 +--
 .../account_analytic_entries_report_view.xml  |  22 +-
 .../report/account_entries_report_view.xml    |  51 +--
 .../report/account_invoice_report_view.xml    |  65 +---
 6 files changed, 201 insertions(+), 383 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c71a7d56aae..ff60f16b75f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -425,32 +425,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <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"/>
-                        <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"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="period_id" string="Period"/>
-                    </group>
-                    <newline/>
+                    <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="journal_id"/>
+                    <field name="period_id" string="Period"/>
+                    <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                    <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
+                    <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
+                    <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                    <separator/>
+                    <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                     <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="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
                         <filter string="Due Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_due'}"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e1f7b91851..703b61be301 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -63,15 +63,10 @@
             <field name="type">search</field>
             <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="state"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
+                    <field name="state"/>
+                    <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
+                    <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -146,11 +141,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Period">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
-                        <separator orientation="vertical"/>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
+                    <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                 </search>
             </field>
         </record>
@@ -217,18 +209,12 @@
             <field name="type">search</field>
             <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="user_type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                    <field name="user_type"/>
+                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
                     </group>
@@ -440,21 +426,15 @@
             <field name="type">search</field>
             <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"/>
+                    <field name="user_id"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
                     <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
+                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                        <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
                     </group>
                 </search>
             </field>
@@ -542,22 +522,15 @@
             <field name="type">search</field>
             <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="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
-                    </group>
-                    <newline/>
+                    <field name="name" string="Bank Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
+                    <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                    <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
+                    <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
                 </search>
@@ -587,22 +560,15 @@
             <field name="type">search</field>
             <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="period_id"/>
-                        <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
-                    </group>
-                    <newline/>
+                    <field name="name" string="Bank Statement"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
+                    <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                    <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
                 </search>
@@ -833,7 +799,7 @@
                 <search string="Account Tax 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"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -916,10 +882,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Taxes">
-                    <group>
-                        <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>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -1064,64 +1028,64 @@
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
                     <sheet> 
-	                    <group>
-	                        <group>
-		                        <field name="name"/>
-		                        <field name="ref"/>
-		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-	                        </group>
-	                        <group>
-		                        <field name="journal_id"/>
-		                        <field name="period_id"/>
-		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-	                        </group>
-	                    </group>
-	                    <notebook colspan="4">
-	                        <page string="Information">
-	                            <group>
-	                                <group string="Amount">
-	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="quantity"/>
-	                                </group>
-	                                <group string="Accounting Documents">
-	                                    <field name="invoice" readonly="True"/>
-	                                    <field name="move_id" required="False"/>
-	                                    <field name="statement_id" readonly="True"/>
-	                                </group>
-	                                <group string="Dates">
-	                                    <field name="date"/>
-	                                    <field name="date_maturity"/>
-	                                    <field name="date_created" readonly="True"/>
-	                                </group>
-	                                <group string="Taxes">
-	                                    <field name="tax_code_id"/>
-	                                    <field name="tax_amount"/>
-	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
-	                                    <field name="currency_id"/>
-	                                    <field name="amount_currency"/>
-	                                </group>
-	                                <group string="Reconciliation">
-	                                    <field name="reconcile_id"/>
-	                                    <field name="reconcile_partial_id"/>
-	                                </group>
-	                                <group string="States">
-	                                    <field name="state"/>
-	                                    <field name="blocked"/>
-	                                </group>
-	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
-	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-	                                </group>
-	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-	                        </page>
-	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-	                        </page>
-	                    </notebook>
+                      <group>
+                          <group>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                          </group>
+                          <group>
+                            <field name="journal_id"/>
+                            <field name="period_id"/>
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                          </group>
+                      </group>
+                      <notebook colspan="4">
+                          <page string="Information">
+                              <group>
+                                  <group string="Amount">
+                                      <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                                      <field name="debit"/>
+                                      <field name="credit"/>
+                                      <field name="quantity"/>
+                                  </group>
+                                  <group string="Accounting Documents">
+                                      <field name="invoice" readonly="True"/>
+                                      <field name="move_id" required="False"/>
+                                      <field name="statement_id" readonly="True"/>
+                                  </group>
+                                  <group string="Dates">
+                                      <field name="date"/>
+                                      <field name="date_maturity"/>
+                                      <field name="date_created" readonly="True"/>
+                                  </group>
+                                  <group string="Taxes">
+                                      <field name="tax_code_id"/>
+                                      <field name="tax_amount"/>
+                                      <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                  </group>
+                                  <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+                                      <field name="currency_id"/>
+                                      <field name="amount_currency"/>
+                                  </group>
+                                  <group string="Reconciliation">
+                                      <field name="reconcile_id"/>
+                                      <field name="reconcile_partial_id"/>
+                                  </group>
+                                  <group string="States">
+                                      <field name="state"/>
+                                      <field name="blocked"/>
+                                  </group>
+                                  <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                      <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                  </group>
+                              </group>
+                              <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+                          </page>
+                          <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+                              <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                          </page>
+                      </notebook>
                     </sheet>
                 </form>
             </field>
@@ -1195,38 +1159,26 @@
             <field name="type">search</field>
             <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"/>
-                        <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
-                        <separator orientation="vertical"/>
-                        <filter
-                            icon="terp-dolar_ok!"
-                            string="Unreconciled"
-                            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="account_id"/>
-                        <field name="partner_id"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
-                        <field name="period_id" context="{'period_id':self}"/>
-                    </group>
-                    <newline/>
+                    <field name="date"/>
+                    <field name="move_id" string="Number (Move)"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id':self}"/>
+                    <field name="period_id" context="{'period_id':self}"/>
+                    <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
+                    <separator/>
+                    <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
+                    <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
+                    <separator/>
+                    <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/>
+                    <separator/>
+                    <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     </group>
-                    <newline/>
                 </search>
             </field>
         </record>
@@ -1444,27 +1396,19 @@
             <field name="type">search</field>
             <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="partner_id"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="period_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
+                    <separator/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -1673,16 +1617,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                    <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/>
+                    <field name="name" string="Journal Entry Model"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
@@ -1852,17 +1791,11 @@
             <field name="type">search</field>
             <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="model_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Subscription"/>
+                    <field name="date_start"/>
+                    <field name="model_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
+                    <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -2119,17 +2052,12 @@
             <field name="type">search</field>
             <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="parent_id"/>
-                        <field name="user_type"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
+                    <field name="parent_id"/>
+                    <field name="user_type"/>
+                    <field name="type"/>
+                    <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
@@ -2188,20 +2116,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                    <group>
-                        <field name="name" string="Account Template"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_root_id"/>
-                        <field name="bank_account_view_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Template"/>
+                    <field name="account_root_id"/>
+                    <field name="bank_account_view_id"/>
                     <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"/>
                         <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
                         <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
-                        <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>
@@ -2310,14 +2232,10 @@
             <field name="type">search</field>
             <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="chart_template_id"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
+                    <field name="chart_template_id"/>
+                    <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
+                    <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                 </search>
             </field>
         </record>
@@ -2353,11 +2271,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search tax template">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
-                        <field name="parent_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
+                    <field name="parent_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
                     </group>
@@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Report">
-                    <group>
-                        <field name="name" string="Account Report"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_report_id"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Report"/>
+                    <field name="account_report_id"/>
+                    <field name="type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5c1542abc29..ba028899506 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -30,22 +30,15 @@
             <field name="type">search</field>
             <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"/>
-                        <field name="partner_id"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                    <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                     </group>
@@ -182,27 +175,19 @@
             <field name="type">search</field>
             <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="account_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Analytic Line"/>
+                    <field name="date"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                     <group string="Group By..." expand="0">
                         <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
                         <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                     </group>
                 </search>
@@ -303,11 +288,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                    <field name="type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 7c9870ca07e..dd927928600 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,31 +34,21 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-                <group>
-                    <field name="day" string="Day"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    <separator orientation="vertical"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id" />
-                    <field name="user_id"/>
-                </group>
-                <newline/>
+                <field name="day" string="Day"/>
+                <field name="date"/>
+                <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="product_id" />
+                <field name="user_id"/>
+                <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 54275f6a4b3..ba2ddf6782d 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -67,54 +67,35 @@
         <field name="type">search</field>
         <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'}"
-                            help="Journal Entries with period in current year"/>
-                    <filter icon="terp-go-month" string="This Period"
-                            name="period"
-                            context="{'period':'current_period'}"
-                            help="Journal Entries with period in current period"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
-                    <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
-                    <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
-                    <separator orientation="vertical"/>
-                    <field name="account_id"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="period_id"/>
-                </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters...">
+                <field name="date"/>
+                <field name="date_created"/>
+                <field name="date_maturity"/>
+                <field name="account_id"/>
+                <field name="journal_id" widget="selection"/>
+                <field name="period_id"/>
+                <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
+                <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
+                <separator/>
+                <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
+                <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
+                <separator/>
+                <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
+                <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
+                <group expand="0" string="Extended Filters...">
                     <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                 </group>
-                <newline/>
+                </group>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
                     <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
                     <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 7d6a4003b53..21d03968d8a 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -55,68 +55,33 @@
         <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"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Draft"
-                           icon="terp-document-new"
-                           domain="[('state','=','draft')]"
-                           help = "Draft Invoices"/>
-                    <filter string="Pro-forma"
-                           icon="terp-gtk-media-pause"
-                           domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
-                           help = "Pro-forma Invoices"/>
-                    <filter string="Invoiced"
-                           name="current"
-                           icon="terp-check"
-                           domain="[('state','not in', ('draft','cancel'))]"
-                           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"/>
-                    <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)]"/>
-                </group>
-                <newline/>
+                <field name="date"/>
+                <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                <filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
+                <separator/>
+                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
+                <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
+                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
+                <separator/>
+                <filter icon="terp-personal" string="Customer" 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/>
+                <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"/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>

From ab213ad2617df8e06f0c291edd6c98ccfb5e43fd Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:27:19 +0530
Subject: [PATCH 2/4] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120719105719-x0rvgw3eg4mbjcck
---
 addons/account/report/account_entries_report_view.xml  | 2 +-
 addons/account/report/account_treasury_report_view.xml | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index ba2ddf6782d..fbe44ee8d12 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -71,7 +71,7 @@
                 <field name="date_created"/>
                 <field name="date_maturity"/>
                 <field name="account_id"/>
-                <field name="journal_id" widget="selection"/>
+                <field name="journal_id"/>
                 <field name="period_id"/>
                 <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
                 <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index 9e07c196f3c..f0096b561bb 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group>
-                    <field name="fiscalyear_id"/>
-                    <field name="period_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </group>
-                <newline/>
+                <field name="fiscalyear_id"/>
+                <field name="period_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
             </search>
         </field>
     </record>

From 6de16a5adbf7a131f691cbdf6477467f975bd3b7 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:46:22 +0530
Subject: [PATCH 3/4] [IMP] account_analytic_analysis:improved search view,.

bzr revid: tpa@tinyerp.com-20120719111622-1mxwu5c9zgs5jexd
---
 .../account_analytic_analysis_menu.xml        | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 8f86e9eeedc..ef9fbcdf130 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -19,32 +19,24 @@
             <field name="type">search</field>
             <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" />
-                        <separator orientation="vertical"/>
-                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
+                    <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
+                        help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
+                    <separator/>
+                    <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                    <separator/>
+                    <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" />
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                     </group>

From 725ab84da9b99bcce1e066741e6a2820cb55413d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 17:24:40 +0530
Subject: [PATCH 4/4] [IMP] remove unnecessary changes.

bzr revid: tpa@tinyerp.com-20120719115440-ccc0whtkrnlv2e9j
---
 addons/account/account_view.xml | 118 ++++++++++++++++----------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 703b61be301..d903b41e6d4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1028,69 +1028,71 @@
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
                     <sheet> 
-                      <group>
-                          <group>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-                          </group>
-                          <group>
-                            <field name="journal_id"/>
-                            <field name="period_id"/>
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
-                          </group>
-                      </group>
-                      <notebook colspan="4">
-                          <page string="Information">
-                              <group>
-                                  <group string="Amount">
-                                      <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                                      <field name="debit"/>
-                                      <field name="credit"/>
-                                      <field name="quantity"/>
-                                  </group>
-                                  <group string="Accounting Documents">
-                                      <field name="invoice" readonly="True"/>
-                                      <field name="move_id" required="False"/>
-                                      <field name="statement_id" readonly="True"/>
-                                  </group>
-                                  <group string="Dates">
-                                      <field name="date"/>
-                                      <field name="date_maturity"/>
-                                      <field name="date_created" readonly="True"/>
-                                  </group>
-                                  <group string="Taxes">
-                                      <field name="tax_code_id"/>
-                                      <field name="tax_amount"/>
-                                      <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                                  </group>
-                                  <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
-                                      <field name="currency_id"/>
-                                      <field name="amount_currency"/>
-                                  </group>
-                                  <group string="Reconciliation">
-                                      <field name="reconcile_id"/>
-                                      <field name="reconcile_partial_id"/>
-                                  </group>
-                                  <group string="States">
-                                      <field name="state"/>
-                                      <field name="blocked"/>
-                                  </group>
-                                  <group groups="analytic.group_analytic_accounting" string="Analytic">
-                                      <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-                                  </group>
-                              </group>
-                              <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-                          </page>
-                          <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                              <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-                          </page>
-                      </notebook>
+	                    <group>
+	                        <group>
+		                        <field name="name"/>
+		                        <field name="ref"/>
+		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+	                        </group>
+	                        <group>
+		                        <field name="journal_id"/>
+		                        <field name="period_id"/>
+		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+	                        </group>
+	                    </group>
+	                    <notebook colspan="4">
+	                        <page string="Information">
+	                            <group>
+	                                <group string="Amount">
+	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+	                                    <field name="debit"/>
+	                                    <field name="credit"/>
+	                                    <field name="quantity"/>
+	                                </group>
+	                                <group string="Accounting Documents">
+	                                    <field name="invoice" readonly="True"/>
+	                                    <field name="move_id" required="False"/>
+	                                    <field name="statement_id" readonly="True"/>
+	                                </group>
+	                                <group string="Dates">
+	                                    <field name="date"/>
+	                                    <field name="date_maturity"/>
+	                                    <field name="date_created" readonly="True"/>
+	                                </group>
+	                                <group string="Taxes">
+	                                    <field name="tax_code_id"/>
+	                                    <field name="tax_amount"/>
+	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+	                                </group>
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                    <field name="currency_id"/>
+	                                    <field name="amount_currency"/>
+	                                </group>
+	                                <group string="Reconciliation">
+	                                    <field name="reconcile_id"/>
+	                                    <field name="reconcile_partial_id"/>
+	                                </group>
+	                                <group string="States">
+	                                    <field name="state"/>
+	                                    <field name="blocked"/>
+	                                </group>
+	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
+	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+	                                </group>
+	                            </group>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+	                        </page>
+	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+	                        </page>
+	                    </notebook>
                     </sheet>
                 </form>
             </field>
         </record>
 
+
+
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>