diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 18d817f41bd..701d3c9fcc9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -141,23 +141,23 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-					<group col="8" colspan="4">
-						<field domain="[('type', '=', 'purchase')]" name="journal_id"/>
-						<field name="number" readonly="1"/>
-						<field name="type" invisible="1"/>
-						<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-						<button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
-						<newline/>
-						<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
-						<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-						<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-						<newline/>
-						<field name="date_invoice"/>
-						<field name="period_id" groups="base.group_user"/>
-						<group colspan="2" col="1" groups="base.group_user">
-						    <label align="0.0" string="(keep empty to use the current period)"/>
-						</group>
-					</group>
+                    <group col="8" colspan="4">
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field name="number" readonly="1"/>
+                        <field name="type" invisible="1"/>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                        <newline/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                        <newline/>
+                        <field name="date_invoice"/>
+                        <field name="period_id" groups="base.group_user"/>
+                        <group colspan="2" col="1" groups="base.group_user">
+                            <label align="0.0" string="(keep empty to use the current period)"/>
+                        </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Invoice">
                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
@@ -201,12 +201,12 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
-									<button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
-									<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-									<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-									<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-									<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-									<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -250,23 +250,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-					<group colspan="4" col="8">
-					<field name="journal_id" groups="base.group_user"/>
-					<field name="number"/>
-					<field name="type" invisible="1"/>
-					<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-					<button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
-					<newline/>
-					<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
-					<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-					<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-					<newline/>
-					<field name="date_invoice"/>
-					<field name="period_id" groups="base.group_user"/>
-					<group colspan="2" col="1" groups="base.group_user">
-					    <label align="0.0" string="(keep empty to use the current period)"/>
-					</group>
-					</group>
+                    <group colspan="4" col="8">
+                    <field name="journal_id" groups="base.group_user"/>
+                    <field name="number"/>
+                    <field name="type" invisible="1"/>
+                    <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                    <newline/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                    <newline/>
+                    <field name="date_invoice"/>
+                    <field name="period_id" groups="base.group_user"/>
+                    <group colspan="2" col="1" groups="base.group_user">
+                        <label align="0.0" string="(keep empty to use the current period)"/>
+                    </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
@@ -294,13 +294,13 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="4" colspan="4" groups="base.group_user">
-									<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
-									<button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
-									<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-									<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-									<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-									<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-									<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -484,9 +484,9 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
-		<!--  Partners inherited form -->
+        <!--  Partners inherited form -->
 
         <record id="view_invoice_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.invoice.info.inherit</field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 88e5249735f..59253809e46 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -804,7 +804,7 @@
             </field>
         </record>
 
-		<record id="view_account_move_line_filter" model="ir.ui.view">
+        <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
@@ -858,6 +858,7 @@
                     <field name="ref"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
+                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="partner_id"/>
                     <field name="line_id"/>
                     <field name="to_check" groups="base.group_extended"/>
@@ -872,21 +873,21 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Entry">
+                <form string="Journal Entries">
                     <group colspan="4" col="6">
-                    <field name="name" select="1" readonly="True"/>
-                    <field name="period_id"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="company_id" required="1" groups="base.group_multi_company"/>
-                    <field name="date" select="1"/>
-                    <field name="ref" select="1"/>
-                    <field name="to_check"/>
-                    <field name="type" groups="base.group_extended"/>
+                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="journal_id" select="1"/>
+                        <field name="period_id"/>
+                        <field name="type"/>
+                        <field name="ref" select="1"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                        <field name="date" select="1" groups="base.group_extended"/>
+                        <field name="to_check" groups="base.group_extended"/>
                     </group>
                     <field name="partner_id" invisible="1" select="1"/>
                     <field name="amount" invisible="1" select="1"/>
 
-                    <field colspan="4" height="250" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                    <field colspan="4" height="260" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -957,6 +958,13 @@
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -973,7 +981,7 @@
         <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Entries by Move</field>
+            <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index a4a789a6e5e..956d9e533a0 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -7,12 +7,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Vouchers">
+                    <field name="date"/>
+                    <field name="number"/>
                     <field name="name"/>
                     <field name="journal_id"/>
+                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="account_id" />
-                    <field name="amount"/>
-                    <field name="date"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="period_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -24,7 +27,7 @@
             <field name="arch" type="xml">
                 <form string="Voucher">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" colspan="4"/>
                         <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
                         <field name="account_id" on_change="onchange_account(account_id)"/>
                         <field name="type" on_change="onchange_journal(journal_id,type)"/>
@@ -69,7 +72,37 @@
                 </form>
             </field>
         </record>
-
+        
+        <record id="view_account_move_filter" model="ir.ui.view">
+            <field name="name">account.voucher.select</field>
+            <field name="model">account.voucher</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Vouchers">
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-account" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="number" select='1'/>
+                        <field name="journal_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                        <field name="period_id" select='1'/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_voucher_list">
             <field name="name">Vouchers</field>
             <field name="res_model">account.voucher</field>