diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 586d06449c8..125926bf124 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -123,13 +123,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index aeea50a0b1a..702b65f5fb1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,6 +49,9 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
+                    <field name="date"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -68,11 +71,8 @@
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
-                    <field name="pay_now"/>
                     <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <field name="date"/>
+                    <field name="pay_now"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 150830431ca..c368f6fd8af 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,13 +9,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
@@ -42,13 +45,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b0a81461334..1b3c1334b36 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,13 +8,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
@@ -40,13 +43,17 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number"
+                        filter_domain="[('number','ilike',self)]"
+                        string="Voucher"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
@@ -90,32 +97,15 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <div class="oe_form_title">
-                        <label for="number" class="oe_form_readonly_hidden"/>
-                        <h1><field name="number" readonly="0" /></h1>
-                    </div>
-
-                    <group>
-                        <group>
-                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                            <field name="name" colspan="2"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                        <group>
-                            <field name="currency_id"/>
-                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                            <field name="account_id"
-                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                  domain="[('type','=','liquidity')]"/>
-                            <field name="reference"
-                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                            />
-                            <field name="paid" invisible="1"/>
-                        </group>
+                    <group col="6">
+                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                        <field name="number"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -128,21 +118,26 @@
                                 </tree>
                             </field>
                             <group col="3">
-                                <group colspan="1">
-                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                <group string="Internal Notes" col="1">
+                                    <field name="narration"/>
                                 </group>
-                                <group>
-                                    <group class="oe_form_subtotal_footer" string="Total">
-                                        <field name="tax_id" 
-                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                            widget="selection"
-                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                        <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
-                                        <button type="object"
-                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                            attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    </group>                                    
+                                <group col="2">
+                                    <separator string="Payment Options" colspan="2"/>
+                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                                    <field name="account_id"
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                          domain="[('type','=','liquidity')]"/>
+                                         <!-- should select income accounts only. Or use the journal for this ? -->
+                                    <field name="reference"
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                    />
+                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                                    <field name="paid" invisible="1"/>
+                                </group>
+                                <group col="4">
+                                    <separator string="Total" colspan="4"/>
+                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>