From bf9448c7c81fbacda1b03135731940021cb426bc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Jun 2012 19:54:11 +0200
Subject: [PATCH] [IMP] cleaning form views

bzr revid: fp@tinyerp.com-20120605175411-ddx99g5kj2dhzzmb
---
 addons/account/account_view.xml               |  95 +++----
 addons/account/partner_view.xml               | 112 ++++----
 .../account_analytic_default_view.xml         |  20 +-
 .../account_analytic_plans.py                 |   2 +-
 .../account_analytic_plans_view.xml           |  50 ++--
 addons/account_anglo_saxon/product_view.xml   |   6 +-
 addons/account_asset/account_asset_view.xml   | 228 +++++++--------
 .../account_bank_statement_view.xml           |  74 ++---
 addons/account_budget/account_budget_view.xml |  98 ++++---
 addons/account_coda/account_coda_view.xml     | 266 +++++++++---------
 .../account_followup_view.xml                 |  36 +--
 .../account_invoice_layout_view.xml           |  11 +-
 .../account_payment/account_payment_view.xml  | 134 +++++----
 .../account_voucher/account_voucher_view.xml  |  42 +--
 .../voucher_payment_receipt_view.xml          | 126 ++++-----
 .../voucher_sales_purchase_view.xml           |  54 ++--
 addons/anonymization/anonymization_view.xml   |  54 ++--
 addons/audittrail/audittrail_view.xml         |  28 +-
 18 files changed, 739 insertions(+), 697 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9bf0021e03e..28797be90cb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2463,10 +2463,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position Template">
-                    <field name="name"/>
-                    <field name="chart_template_id"/>
-                    <newline/>
-                    <field name="tax_ids" colspan="4" nolabel="1">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="chart_template_id"/>
+                    </group>
+                    <field name="tax_ids">
                         <tree string="Taxes Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -2476,7 +2477,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4" nolabel="1">
+                    <field name="account_ids">
                         <tree string="Accounts Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -2544,19 +2545,19 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Statement" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="name" select="1"/>
+                <sheet string="Statement">
+                    <group col="4">
+                        <field name="name"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
-                        <field name="user_id" select="1" readonly="1"/>
-                        <field name="period_id" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                        <field name="user_id" readonly="1"/>
+                        <field name="period_id"/>
                         <field name="currency" invisible="1"/>
                     </group>
 
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
-                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
+                            <field name="line_ids" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
                                     <field name="date"/>
@@ -2569,23 +2570,25 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines">
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
-                                    <field name="amount"/>
-                                    <field name="sequence"/>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="note" nolabel="1"/>
+                                    <group col="4">
+                                        <field name="date"/>
+                                        <field name="name"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                        <field name="amount"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                    <separator string="Notes"/>
+                                    <field name="note"/>
                                 </form>
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group col="2" colspan="2" expand="1">
-                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">
+                            <group>
+                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
                                     <tree string = "Opening Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2597,9 +2600,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                         <field name="subtotal"/>
                                     </form>
                                 </field>
-                            </group>
-                            <group col="2" colspan="2" expand="1">
-                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','open')]}">
+                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
                                     <tree string = "Closing Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2614,22 +2615,19 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field colspan="4" name="move_line_ids" nolabel="1" string="Journal Entries"/>
+                            <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator string="Dates" colspan="4"/>
-                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
-                            <field name="closing_date" select="1" readonly="1"/>
+                    <group col="3">
+                        <group string="Dates">
+                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
+                            <field name="closing_date" readonly="1"/>
                         </group>
-                        <group col="2" colspan="2">
-                            <separator string="Opening Balance" colspan="4"/>
+                        <group string="Opening Balance">
                             <field name="balance_start" readonly="1" string="Opening Balance"/>
                             <field name="total_entry_encoding"/>
                         </group>
-                        <group col="2" colspan="2">
-                            <separator string="Closing Balance" colspan="4"/>
+                        <group string="Closing Balance">
                             <field name="balance_end"/>
                             <field name="balance_end_cash"/>
                         </group>
@@ -2701,7 +2699,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Report">
-                    <group col="6" colspan="4">
+                    <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
@@ -2709,19 +2707,14 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         <field name="sign"/>
                         <field name="style_overwrite"/>
                     </group>
-                    <notebook colspan="6">
+                    <notebook>
                         <page string="Report">
-                            <group colspan="4" col="4">
-                                <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"  colspan="2"/>
-                                <label string="" colspan="2"/>
+                            <group>
+                                <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
+                                <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
                             </group>
-                            <newline/>
-                            <field name="account_ids" nolabel="1" colspan="6" attrs="{'invisible': [('type', '!=', 'accounts')]}"/>
-                            <newline/>
-                            <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
-                            <newline/>
-                            <field name="account_type_ids" nolabel="1" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
-                            <newline/>
+                            <field name="account_ids" attrs="{'invisible': [('type', '!=', 'accounts')]}"/>
+                            <field name="account_type_ids" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 52e0820508c..998140287ab 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -8,14 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
-                    <group colspan="4" col="6">
+                    <group col="4">
                         <field name="name" select="1"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="active"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <separator string="Mapping" colspan="4"/>
-                    <newline/>
-                    <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
+                    <separator string="Mapping"/>
+                    <field name="tax_ids" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -25,7 +24,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
+                    <field name="account_ids" widget="one2many_list">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -35,8 +34,8 @@
                             <field name="account_dest_id"/>
                         </form>
                     </field>
-                    <separator string="Notes" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -77,55 +76,56 @@
             <field name="arch" type="xml">
                 <page string="History" position="before">
                 <page string="Accounting">
-                    <group col="2" colspan="2">
-                        <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable" groups="account.group_account_invoice" />
-                        <field name="property_account_position" widget="selection"/>
-                        <field name="property_payment_term" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Supplier Accounting Properties" colspan="2"/>
-                        <field name="property_account_payable" groups="account.group_account_invoice"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Customer Credit" colspan="2"/>
-                        <field name="credit"/>
-                        <field name="credit_limit"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Supplier Debit" colspan="2"/>
-                        <field name="debit"/>
-                    </group>
-                    <field colspan="4" name="bank_ids" nolabel="1">
-                        <form string="Bank account">
-                            <field name="state"/>
-                            <newline/>
-                            <field name="acc_number"/>
-                            <newline/>
-                            <group name="owner" colspan="2" col="2">
-                                <separator colspan="4" string="Bank Account Owner"/>
-                                <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                <field name="owner_name"/>
-                                <field name="street"/>
-                                <field name="city"/>
-                                <field name="zip"/>
-                                <field name="state_id"/>
-                                <field name="country_id"/>
-                            </group>
-                            <group name="bank" colspan="2" col="2">
-                                <separator colspan="2" string="Information About the Bank"/>
-                                <field name="bank" on_change="onchange_bank_id(bank)"/>
+                    <group>
+                        <group string="Customer Accounting Properties">
+                            <field name="property_account_receivable" groups="account.group_account_invoice" />
+                            <field name="property_account_position" widget="selection"/>
+                            <field name="property_payment_term" widget="selection"/>
+                        </group>
+                        <group string="Supplier Accounting Properties">
+                            <field name="property_account_payable" groups="account.group_account_invoice"/>
+                        </group>
+                        <group string="Customer Credit">
+                            <field name="credit"/>
+                            <field name="credit_limit"/>
+                        </group>
+                        <group string="Supplier Debit">
+                            <field name="debit"/>
+                        </group>
+                        <field name="bank_ids">
+                            <form string="Bank account">
+                                <field name="state"/>
+                                <field name="acc_number"/>
+                                <group>
+                                    <group name="owner" string="Bank Account Owner">
+                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                        <field name="owner_name"/>
+                                        <label for="street" string="Address"/>
+                                        <div>
+                                            <field name="street" placeholder="Street..."/>
+                                            <div>
+                                                <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
+                                                <field name="city" class="oe_form_inline" placeholder="City"/>
+                                            </div>
+                                            <field name="state_id" placeholder="State"/>
+                                            <field name="country_id" placeholder="Country"/>
+                                        </div>
+                                    </group>
+                                    <group name="bank" string="Information About the Bank">
+                                        <field name="bank" on_change="onchange_bank_id(bank)"/>
+                                        <field name="bank_name"/>
+                                        <field name="bank_bic"/>
+                                    </group>
+                                </group>
+                            </form>
+                            <tree string="Bank Details">
+                                <field name="sequence" invisible="1"/>
+                                <field name="acc_number"/>
                                 <field name="bank_name"/>
-                                <field name="bank_bic"/>
-                            </group>
-                        </form>
-                        <tree string="Bank Details">
-                            <field name="sequence" invisible="1"/>
-                            <field name="acc_number"/>
-                            <field name="bank_name"/>
-                            <field name="owner_name"/>
-                        </tree>
-                    </field>
+                                <field name="owner_name"/>
+                            </tree>
+                        </field>
+                    </group>
                 </page>
                 </page>
             </field>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 8b601022de4..88772aede84 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -25,15 +25,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                    <field name="sequence"/>
-                    <separator string="Conditions" colspan="4"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <group col="4">
+                        <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+                        <field name="sequence"/>
+                        <separator string="Conditions" colspan="4"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 9f3e55dbe28..c52485ae623 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -82,7 +82,7 @@ class account_analytic_plan_line(osv.osv):
     _description = "Analytic Plan Line"
     _order = "sequence, id"
     _columns = {
-        'plan_id': fields.many2one('account.analytic.plan','Analytic Plan'),
+        'plan_id': fields.many2one('account.analytic.plan','Analytic Plan',required=True),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
         'sequence': fields.integer('Sequence'),
         'root_analytic_id': fields.many2one('account.analytic.account', 'Root Account', help="Root account of this plan.", required=False),
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index ae4db10803e..d7a7aeb1098 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -112,19 +112,21 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Distribution">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="plan_id" required="True"/>
-                <field name="journal_id"/>
-                <field name="account_ids" nolabel="1" colspan="4">
-                  <form string="Analytic Distribution">
-                        <field name="rate"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    </form>
+                <group col="4">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="plan_id"/>
+                    <field name="journal_id"/>
+                </group>
+                <field name="account_ids">
                     <tree string="Analytic Distribution" editable="bottom">
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </tree>
+                    <form string="Analytic Distribution">
+                        <field name="rate"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                    </form>
                 </field>
             </form>
         </field>
@@ -166,9 +168,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Distribution Line">
-                <field name="plan_id"/>
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                <field name="rate"/>
+                <group col="4">
+                    <field name="plan_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="rate"/>
+                </group>
             </form>
         </field>
     </record>
@@ -203,9 +207,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Plan">
-                <field name="name"/>
-                <field name="default_instance_id"/>
-                <field name="plan_ids" colspan="4" nolabel="1"/>
+                <group col="4">
+                    <field name="name"/>
+                    <field name="default_instance_id"/>
+                </group>
+                <field name="plan_ids"/>
             </form>
         </field>
     </record>
@@ -247,12 +253,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Plan Line">
-                <field name="name"/>
-                <field name="sequence"/>
-                <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
-                <newline/>
-                <field name="min_required"/>
-                <field name="max_required"/>
+                <group col="4">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
+                    <newline/>
+                    <field name="min_required"/>
+                    <field name="max_required"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 8187e6fa92b..74dce06b85a 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -35,9 +35,9 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <form position="inside">
-                    <group col="2" colspan="2">
-                        <separator string=" Accounting Property" colspan="2"/>
-                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <group>
+                        <separator string="Accounting Property" colspan="2"/>
+                        <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 5e1a5f68d95..c46dc7d5d6f 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -11,34 +11,35 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset category">
-                <field name="name"/>
-                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                <separator string="Accounting Information" colspan="4"/>
-                <field name="journal_id"/>
-                <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
-                <field name="account_depreciation_id"/>
-                <field name="account_expense_depreciation_id"/>
-                <group colspan="2" col="2">
-                    <separator string="Depreciation Dates" colspan="2"/>
-                    <field name="method_time"/>
-                    <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-                    <field name="method_period"/>
-                    <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+                <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <group>
+                        <field name="journal_id"/>
+                        <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
+                        <field name="account_depreciation_id"/>
+                        <field name="account_expense_depreciation_id"/>
+                    </group>
+                    <group string="Depreciation Dates">
+                        <field name="method_time"/>
+                        <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+                        <field name="method_period"/>
+                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+                    </group>
+                    <group string="Depreciation Method">
+                        <field name="method"/>
+                        <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                        <field name="prorata"/>
+                        <field name="open_asset"/>
+                    </group>
+                    <group groups="analytic.group_analytic_accounting" string="Analytic Information">
+                        <field name="account_analytic_id"/>
+                    </group>
                 </group>
-                <group colspan="2" col="2">
-                    <separator string="Depreciation Method" colspan="2"/>
-                    <field name="method"/>
-                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                    <field name="prorata"/>
-                    <field name="open_asset"/>
-                </group>
-            <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-                <separator string="Analytic Information" colspan="4"/>
-                <newline/>
-                <field name="account_analytic_id"/>
-            </group>
-                <separator string="Notes" colspan="4"/>
-                <field name="note" colspan="4" nolabel="1"/>
+                <separator string="Notes"/>
+                <field name="note"/>
             </form>
         </field>
     </record>
@@ -78,75 +79,79 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-           <form layout="manual">
-           <div class="oe_form_topbar">
-               <button name="validate" states="draft" string="Confirm Asset" type="object"/>
-               <button name="set_to_close" states="open" string="Set to Close" type="object"/>
-               <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
-               <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-           </div>
-           <sheet string="Asset" layout="auto">
-              <group col="6" colspan="4" class="oe_form_header">
-                 <field name="name"/>
-                 <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                 <field name="code"/>
-                 <field name="purchase_value"/>
-                 <field name="salvage_value"/>
-                 <field name="value_residual"/>
-                 <field name="currency_id"/>
-                 <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
-              </group>
-              <notebook colspan="4">
-                 <page string="General">
-                    <separator string="Other Information" colspan="4"/>
-                    <field name="partner_id"/>
-                    <field name="purchase_date"/>
-                    <field name="parent_id"/>
-                    <newline/>
-                    <group colspan="2" col="2">
-                        <separator string="Depreciation Dates" colspan="2"/>
-                        <field name="method_time" on_change="onchange_method_time(method_time)"/>
-                        <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-                        <field name="method_period"/>
-                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-                        <newline/>
-                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Depreciation Method" colspan="2"/>
-                        <field name="method"/>
-                        <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                        <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                    </group>
-                 </page>
-                 <page string="Depreciation Board">
-                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
-                       <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
-                          <field name="depreciation_date"/>
-                          <field name="sequence" invisible="1"/>
-                          <field name="depreciated_value" readonly="1"/>
-                          <field name="amount"/>
-                          <field name="remaining_value" readonly="1"/>
-                          <field name="move_check"/>
-                          <field name="parent_state" invisible="1"/>
-                          <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
-                       </tree>
-                       <graph type="bar">
-                          <field name="name"/>
-                          <field name="amount"/>
-                          <field name="depreciated_value"/>
-                       </graph>
-                    </field>
-                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
-                 </page>
-                 <page string="History">
-                    <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>
-                    <field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
-                 </page>
-                 <page string="Notes">
-                    <field name="note" nolabel="1"/>
-                 </page>
-              </notebook>
+            <form string="Asset">
+                <header>
+                    <button name="validate" states="draft" string="Confirm Asset" type="object"/>
+                    <button name="set_to_close" states="open" string="Set to Close" type="object"/>
+                    <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                </header>
+                <sheet>
+                    <label for="name">
+                    <h1><field name="name"/></h1>
+                    <label for="category_id">
+                    <h2><field name="category_id" on_change="onchange_category_id(category_id)"/></h2>
+                    <notebook colspan="4">
+                        <page string="General">
+                        <group>
+                            <group>
+                                <field name="code"/>
+                                <field name="company_id" widget="selection"
+                                   groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                            </group>
+                            <group>
+                                <field name="purchase_value"/>
+                                <field name="salvage_value"/>
+                                <field name="value_residual"/>
+                                <field name="currency_id"/>
+                            </group>
+                            </group>
+                                <field name="partner_id"/>
+                                <field name="purchase_date"/>
+                                <field name="parent_id"/>
+                            </group>
+                            <group>
+                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
+                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+                                <field name="method_period"/>
+                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
+                            </group>
+                            <group>
+                                <field name="method"/>
+                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
+                            </group>
+                        </group>
+                        </page>
+                        <page string="Depreciation Board">
+                            <field name="depreciation_line_ids" mode="tree,graph">
+                               <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
+                                  <field name="depreciation_date"/>
+                                  <field name="sequence" invisible="1"/>
+                                  <field name="depreciated_value" readonly="1"/>
+                                  <field name="amount"/>
+                                  <field name="remaining_value" readonly="1"/>
+                                  <field name="move_check"/>
+                                  <field name="parent_state" invisible="1"/>
+                                  <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
+                               </tree>
+                               <graph type="bar">
+                                  <field name="name"/>
+                                  <field name="amount"/>
+                                  <field name="depreciated_value"/>
+                               </graph>
+                            </field>
+                            <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
+                        </page>
+                        <page string="History">
+                            <field name="account_move_line_ids" readonly="1"/>
+                            <field name="history_ids" readonly="1"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
               </sheet>
            </form>
        </field>
@@ -220,21 +225,22 @@
         <field name="model">account.asset.history</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset history">
-              <group col="6" colspan="4">
-                <field name="name"/>
-                <field name="date"/>
-                <field name="user_id"/>
-              </group>
-              <group col="2" colspan="2">
-                <separator string="Depreciation Dates" colspan="2"/>
-                <field name="method_time"/>
-                <field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/>
-                <field name="method_period"/>
-                <field name="method_end" attrs="{'invisible':[('method_time','=','number')]}"/>
-              </group>
-              <separator string="Notes" colspan="4"/>
-              <field name="note" colspan="4" nolabel="1"/>
+            <form string="Asset History">
+                <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                    </group>
+                    <group>
+                        <field name="method_time"/>
+                        <field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/>
+                        <field name="method_period"/>
+                        <field name="method_end" attrs="{'invisible':[('method_time','=','number')]}"/>
+                    </group>
+                </group>
+                <separator string="Notes"/>
+                <field name="note"/>
             </form>
         </field>
     </record>
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 0138d0ea22b..f2e4d654f72 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -10,25 +10,27 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Batch Payment Info">
-          <field name="name"/>
-          <field name="amount"/>
-          <field name="code"/>
-          <field name="parent_id"/>
-          <field name="type"/>
-          <notebook colspan="4">
-            <page string="Transactions">
-              <field colspan="4" name="bank_statement_line_ids" nolabel="1"/>
-            </page>
-            <page string="Child Batch Payments">
-              <field colspan="4" name="child_ids" nolabel="1">
-                <tree string="Child Batch Payments">
-                  <field name="name"/>
-                  <field name="amount"/>
-                  <field name="code"/>
-                </tree>
-              </field>
-            </page>
-          </notebook>
+            <group col="4">
+                <field name="name"/>
+                <field name="amount"/>
+                <field name="code"/>
+                <field name="parent_id"/>
+                <field name="type"/>
+            </group>
+            <notebook>
+                <page string="Transactions">
+                  <field name="bank_statement_line_ids"/>
+                </page>
+                <page string="Child Batch Payments">
+                  <field name="child_ids">
+                    <tree string="Child Batch Payments">
+                      <field name="name"/>
+                      <field name="amount"/>
+                      <field name="code"/>
+                    </tree>
+                  </field>
+                </page>
+            </notebook>
         </form>
       </field>
     </record>
@@ -93,22 +95,24 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Statement Line">
-          <field name="statement_id"/>
-          <field name="journal_id"/>
-          <field name="date"/>
-          <field name="val_date"/>
-          <field name="name"/>
-          <field name="ref" readonly="0"/>
-          <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-          <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
-          <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
-          <field name="amount"/>
-          <field name="globalisation_id"/>
-          <field name="sequence" readonly="0"/>
-          <field name="state"/>
-          <separator colspan="4" string="Notes"/>
-          <field colspan="4" name="note" nolabel="1"/>
+          <group col="4">
+              <field name="statement_id"/>
+              <field name="journal_id"/>
+              <field name="date"/>
+              <field name="val_date"/>
+              <field name="name"/>
+              <field name="ref" readonly="0"/>
+              <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+              <field name="type" on_change="onchange_type(partner_id, type)"/>
+              <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+              <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+              <field name="amount"/>
+              <field name="globalisation_id"/>
+              <field name="sequence" readonly="0"/>
+              <field name="state"/>
+          </group>
+          <separator string="Notes"/>
+          <field name="note"/>
         </form>
       </field>
     </record>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 667d35a9d6d..1c975cef727 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -56,15 +56,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budgetary Position">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="company_id"  groups="base.group_multi_company" widget="selection"/>
-                    <notebook colspan="4">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="company_id"  groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook>
                         <page string="Accounts">
-                            <field name="account_ids" colspan="4" nolabel="1"/>
+                            <field name="account_ids"/>
                         </page>
                         <page string="Budget Lines">
-                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
+                            <field name="crossovered_budget_line" widget="one2many_list" mode="graph,tree">
                                 <graph type="bar" string="Lines">
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="planned_amount" operator="+"/>
@@ -82,15 +84,17 @@
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
-                                    <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="paid_date"/>
-                                    <field name="planned_amount"/>
-                                    <field name="practical_amount" select="1"/>
-                                    <field name="theoritical_amount"/>
-                                    <field name="percentage"/>
+                                    <group col="4">
+                                        <field name="crossovered_budget_id"/>
+                                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                                        <field name="date_from"/>
+                                        <field name="date_to"/>
+                                        <field name="paid_date"/>
+                                        <field name="planned_amount"/>
+                                        <field name="practical_amount" select="1"/>
+                                        <field name="theoritical_amount"/>
+                                        <field name="percentage"/>
+                                    </group>
                                 </form>
                             </field>
                         </page>
@@ -104,17 +108,17 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" />
                     <button string="Approve" name="validate" states="confirm" type="workflow"/>
                     <button string="Done" name="done" states="validate" type="workflow"   />
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Budget" layout="auto">
-                <group class="oe_form_header">
+                <sheet string="Budget">
+                    <group col="4">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -135,16 +139,18 @@
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
-                                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                                    <field name="general_budget_id" select="1"/>
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="paid_date" select="1"/>
-                                    <field name="planned_amount" select="1"/>
-                                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                    <group col="4">
+                                        <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                                        <field name="general_budget_id" select="1"/>
+                                        <field name="date_from"/>
+                                        <field name="date_to"/>
+                                        <field name="paid_date" select="1"/>
+                                        <field name="planned_amount" select="1"/>
+                                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                    </group>
                                 </form>
                             </field>
-                            </group>
+                        </group>
                     </sheet>
                 </form>
             </field>
@@ -225,17 +231,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Lines">
-                    <field name="crossovered_budget_id"/>
-                    <field name="analytic_account_id"/>
-                    <field name="general_budget_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="paid_date"/>
-                    <field name="planned_amount"/>
-                    <field name="practical_amount"/>
-                    <field name="theoritical_amount"/>
-                    <field name="percentage"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group col="4">
+                        <field name="crossovered_budget_id"/>
+                        <field name="analytic_account_id"/>
+                        <field name="general_budget_id"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <field name="paid_date"/>
+                        <field name="planned_amount"/>
+                        <field name="practical_amount"/>
+                        <field name="theoritical_amount"/>
+                        <field name="percentage"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -281,12 +289,14 @@
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
-                                    <field name="crossovered_budget_id"/>
-                                    <field name="general_budget_id"/>
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="paid_date"/>
-                                    <field name="planned_amount"/>
+                                    <group col="4">
+                                        <field name="crossovered_budget_id"/>
+                                        <field name="general_budget_id"/>
+                                        <field name="date_from"/>
+                                        <field name="date_to"/>
+                                        <field name="paid_date"/>
+                                        <field name="planned_amount"/>
+                                    </group>
                                 </form>
                                 <graph type="bar" string="Lines">
                                     <field name="general_budget_id" />
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 41a69c63bbf..df05bb8708e 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -11,22 +11,22 @@
       <field name="model">coda.bank.account</field>
       <field name="type">search</field>
       <field name="arch" type="xml">
-        <form string="CODA Bank Account Configuration">
-          <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-          <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-          <separator orientation="vertical"/>
-          <field name="name"/>
-          <field name="bank_id"/>
-          <field name="description1"/>
-          <field name="journal"/>
-          <field name="currency" widget="selection"/>
-          <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-            <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
-          </group>
-        </form>
+          <search string="CODA Bank Account Configuration">
+              <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+              <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
+              <separator orientation="vertical"/>
+              <field name="name"/>
+              <field name="bank_id"/>
+              <field name="description1"/>
+              <field name="journal"/>
+              <field name="currency" widget="selection"/>
+              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+              <newline/>
+              <group expand="0" string="Group By...">
+                <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
+                <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+              </group>
+          </search>
       </field>
     </record>
     <record id="view_coda_bank_account_list" model="ir.ui.view">
@@ -50,23 +50,25 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="CODA Bank Account Configuration">
-          <field name="name" select="1" colspan="4"/>
-          <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
-          <field name="description1"/>
-          <field name="currency"/>
-          <field name="description2"/>
-          <field name="coda_st_naming"/>
-          <field name="state" on_change="onchange_state(state)"/>
-          <field name="journal" attrs="{'invisible':[('state','=','info')]}"/>
-          <newline/>
-          <field name="def_payable"/>
-          <field name="def_receivable"/>
-          <field name="awaiting_account"/>
-          <field name="transfer_account"/>
-          <field name="find_bbacom"/>
-          <field name="find_partner"/>
-          <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-          <field name="active"/>
+            <group col="4">
+                <field name="name" select="1" colspan="4"/>
+                <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
+                <field name="description1"/>
+                <field name="currency"/>
+                <field name="description2"/>
+                <field name="coda_st_naming"/>
+                <field name="state" on_change="onchange_state(state)"/>
+                <field name="journal" attrs="{'invisible':[('state','=','info')]}"/>
+                <newline/>
+                <field name="def_payable"/>
+                <field name="def_receivable"/>
+                <field name="awaiting_account"/>
+                <field name="transfer_account"/>
+                <field name="find_bbacom"/>
+                <field name="find_partner"/>
+                <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                <field name="active"/>
+            </group>
         </form>
       </field>
     </record>
@@ -97,11 +99,13 @@
       <field name="model">account.coda.trans.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Transaction Type">
-          <field name="type"/>
-          <field name="parent_id"/>
-          <field name="description" colspan="4"/>
-        </form>
+          <form string="CODA Transaction Type">
+              <group col="4">
+                  <field name="type"/>
+                  <field name="parent_id"/>
+                  <field name="description" colspan="4"/>
+              </group>
+          </form>
       </field>
     </record>
     <record id="action_account_coda_trans_type_form" model="ir.actions.act_window">
@@ -132,13 +136,15 @@
       <field name="model">account.coda.trans.code</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Transaction Code">
-          <field name="code"/>
-          <field name="type"/>
-          <field name="parent_id"/>
-          <field name="description"/>
-          <field name="comment" colspan="4"/>
-        </form>
+          <form string="CODA Transaction Code">
+              <group col="4">
+                  <field name="code"/>
+                  <field name="type"/>
+                  <field name="parent_id"/>
+                  <field name="description"/>
+              </group>
+              <field name="comment"/>
+          </form>
       </field>
     </record>
     <record id="action_account_coda_trans_code_form" model="ir.actions.act_window">
@@ -167,10 +173,10 @@
       <field name="model">account.coda.trans.category</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Transaction Category">
-          <field name="category"/>
-          <field name="description"/>
-        </form>
+          <form string="CODA Transaction Category">
+              <field name="category"/>
+              <field name="description"/>
+          </form>
       </field>
     </record>
     <record id="action_account_coda_trans_category_form" model="ir.actions.act_window">
@@ -199,10 +205,10 @@
       <field name="model">account.coda.comm.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Structured Communication Type">
-          <field name="code"/>
-          <field name="description"/>
-        </form>
+          <form string="CODA Structured Communication Type">
+              <field name="code"/>
+              <field name="description"/>
+          </form>
       </field>
     </record>
     <record id="action_account_coda_comm_type_form" model="ir.actions.act_window">
@@ -239,19 +245,19 @@
       <field name="model">account.coda</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA File">
-          <group colspan="4" col="6">
-            <field name="coda_creation_date"/>
-            <field name="name"/>
-            <field name="coda_data" filename="name"/>
-            <field name="date"/>
-            <field name="user_id"/>
-            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-          </group>
-          <separator colspan="4" string="Additional Information"/>
-          <field name="note" nolabel="1" colspan="4" />
-          <field name="statement_ids" nolabel="1" colspan="4"/>
-        </form>
+          <form string="CODA File">
+              <group col="4">
+                  <field name="coda_creation_date"/>
+                  <field name="name"/>
+                  <field name="coda_data" filename="name"/>
+                  <field name="date"/>
+                  <field name="user_id"/>
+                  <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+              </group>
+              <separator string="Additional Information"/>
+              <field name="note"/>
+              <field name="statement_ids"/>
+          </form>
       </field>
     </record>
     
@@ -315,55 +321,59 @@
       <field name="model">coda.bank.statement</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Bank Statement">
-          <field name="name" select="1"/>
-          <field name="date" select="1"/>
-          <field name="coda_bank_account_id" select="1"/>
-          <field name="currency"/>
-          <field name="period_id" select="2"/>
-          <field name="type"/>
-          <newline/>
-          <field name="balance_start"/>
-          <field name="balance_end_real"/>
-          <notebook colspan="4">
-            <page string="Transactions">
-              <field colspan="4" name="line_ids" nolabel="1">
-                <tree string="CODA Statement Lines">
-                  <field name="sequence" string="Seq"/>
-                  <field name="date"/>
-                  <field name="val_date"/>
-                  <field name="ref"/>
-                  <field name="name" width="250"/>
-                  <field name="type"/>
-                  <field name="partner_id"/>
-                  <field name="account_id"/>
-                  <field name="amount"/>
-                  <field name="globalisation_amount" string="Glob. Amount"/>
-                  <field name="globalisation_id" string="Glob. Id"/>
-                </tree>
-                <form string="CODA Statement Lines">
-                  <field name="sequence" string="Seq"/>
-                  <field name="date"/>
-                  <field name="val_date"/>
+          <form string="CODA Bank Statement">
+              <group col="4">
                   <field name="name"/>
+                  <field name="date"/>
+                  <field name="coda_bank_account_id"/>
+                  <field name="currency"/>
+                  <field name="period_id"/>
                   <field name="type"/>
-                  <field name="partner_id"/>
-                  <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
-                  <field name="amount"/>
-                  <field name="ref"/>
-                  <field name="globalisation_amount"/>
-                  <field name="globalisation_level"/>
-                  <field name="globalisation_id"/>
-                  <separator colspan="4" string="Notes"/>
-                  <field colspan="4" name="note" nolabel="1"/>
-                </form>
-              </field>
-            </page>
-          </notebook>
-          <group colspan="4">
-            <field name="balance_end"/>
-          </group>
-        </form>
+                  <newline/>
+                  <field name="balance_start"/>
+                  <field name="balance_end_real"/>
+              </group>
+              <notebook>
+                <page string="Transactions">
+                  <field name="line_ids">
+                    <tree string="CODA Statement Lines">
+                      <field name="sequence" string="Seq"/>
+                      <field name="date"/>
+                      <field name="val_date"/>
+                      <field name="ref"/>
+                      <field name="name" width="250"/>
+                      <field name="type"/>
+                      <field name="partner_id"/>
+                      <field name="account_id"/>
+                      <field name="amount"/>
+                      <field name="globalisation_amount" string="Glob. Amount"/>
+                      <field name="globalisation_id" string="Glob. Id"/>
+                    </tree>
+                    <form string="CODA Statement Lines">
+                      <group col="4">
+                          <field name="sequence" string="Seq"/>
+                          <field name="date"/>
+                          <field name="val_date"/>
+                          <field name="name"/>
+                          <field name="type"/>
+                          <field name="partner_id"/>
+                          <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                          <field name="amount"/>
+                          <field name="ref"/>
+                          <field name="globalisation_amount"/>
+                          <field name="globalisation_level"/>
+                          <field name="globalisation_id"/>
+                      </group>
+                      <separator string="Notes"/>
+                      <field name="note"/>
+                    </form>
+                  </field>
+                </page>
+              </notebook>
+              <group colspan="4">
+                <field name="balance_end"/>
+              </group>
+          </form>
       </field>
     </record>
 
@@ -436,20 +446,22 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="CODA Statement Line">
-          <field name="statement_id"/>
-          <field name="coda_bank_account_id"/>
-          <field name="date"/>
-          <field name="val_date"/>
-          <field name="name"/>
-          <field name="ref" readonly="0"/>
-          <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-          <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
-          <field name="amount"/>
-          <field name="globalisation_id"/>
-          <field name="sequence" readonly="0"/>
-          <separator colspan="4" string="Notes"/>
-          <field colspan="4" name="note" nolabel="1"/>
+            <group col="4">
+                <field name="statement_id"/>
+                <field name="coda_bank_account_id"/>
+                <field name="date"/>
+                <field name="val_date"/>
+                <field name="name"/>
+                <field name="ref" readonly="0"/>
+                <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                <field name="type" on_change="onchange_type(partner_id, type)"/>
+                <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                <field name="amount"/>
+                <field name="globalisation_id"/>
+                <field name="sequence" readonly="0"/>
+            </group>
+            <separator string="Notes"/>
+            <field name="note"/>
         </form>
       </field>
     </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 7f9d905a44c..74de731aa2f 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -20,19 +20,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Steps">
-                  <group col="6" colspan="4">
-                     <field name="name"/>
-                     <field name="delay"/>
-                     <field name="start"/>
-                  </group>
-                    <newline/>
-                    <separator string="Message" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
-                    <separator string="Legend" colspan="4"/>
-                    <label string="%%(partner_name)s: Partner Name" colspan="2"/>
-                    <label string="%%(date)s: Current Date" colspan="2"/>
-                    <label string="%%(user_signature)s: User Name" colspan="2"/>
-                    <label string="%%(company_name)s: User's Company Name" colspan="2"/>
+                    <group col="4">
+                       <field name="name"/>
+                       <field name="delay"/>
+                       <field name="start"/>
+                    </group>
+                    <separator string="Message"/>
+                    <field name="description"/>
+                    <separator string="Legend"/>
+                    <group>
+                        <label string="%%(partner_name)s: Partner Name"/>
+                        <label string="%%(date)s: Current Date"/>
+                        <label string="%%(user_signature)s: User Name"/>
+                        <label string="%%(company_name)s: User's Company Name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -43,10 +44,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up">
-                    <field name="name"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field colspan="4" name="followup_line" nolabel="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <field name="followup_line"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 5073568d674..de9f37b4374 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -12,7 +12,7 @@
                 <field name="name" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
                     <field name="sequence"/>
-            	</field>
+                </field>
             </field>
         </record>
 
@@ -96,11 +96,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Messages">
-                <separator string="Write a notification or a wishful message." colspan="4"/>
-                <field name="name" colspan="2" />
-                <newline/>
-                <separator string="Special Message" colspan="4"/>
-                <field name="msg" nolabel="1" colspan="2"/>
+                <separator string="Write a notification or a wishful message."/>
+                <field name="name"/>
+                <separator string="Special Message"/>
+                <field name="msg"/>
             </form>
         </field>
     </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 892c8636caf..7309992ade0 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -77,11 +77,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Mode">
-                    <field name="name" select="1"/>
-                    <field name="journal" select="1"/>
-                    <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
-                    <field name="partner_id" select="1" widget='selection' invisible="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="journal"/>
+                        <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
+                        <field name="company_id" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                        <field name="partner_id" widget='selection' invisible="1"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -100,58 +102,63 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" />
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
                     <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
-                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
+                    <group col="4">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
                       <field name="date_prefered"/>
-                      <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                      <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
                       <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                      <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                          type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     </group>
-                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" context="{'order_id': active_id or False}" >
+                    <field name="line_ids" context="{'order_id': active_id or False}" >
                         <form string="Payment Line">
                             <notebook>
                                 <page string="Payment">
-                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
-                                    <separator colspan="4" string="Transaction Information"/>
-                                    <field name="date"/>
-                                    <group colspan="2">
-                                        <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
-                                        <field name="currency" nolabel="1"/>
+                                    <group col="4">
+                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
+                                        <separator colspan="4" string="Transaction Information"/>
+                                        <field name="date"/>
+                                        <label for="amount_currency"/>
+                                        <div>
+                                            <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_form_inline"/>
+                                        </div>
+                                        <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
+                                        <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
+                                        <separator colspan="2" string="Owner Account"/>
+                                        <separator colspan="2" string="Destination Account"/>
+                                        <field colspan="2" name="info_owner" nolabel="1"/>
+                                        <field colspan="2" name="info_partner" nolabel="1"/>
+                                        <field colspan="4" name="communication"/>
+                                        <field colspan="4" name="communication2"/>
+                                        <field name="name"/>
+                                        <field name="state"/>
+                                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                                     </group>
-                                    <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
-                                    <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
-                                    <separator colspan="2" string="Owner Account"/>
-                                    <separator colspan="2" string="Destination Account"/>
-                                    <field colspan="2" name="info_owner" nolabel="1"/>
-                                    <field colspan="2" name="info_partner" nolabel="1"/>
-                                    <field colspan="4" name="communication"/>
-                                    <field colspan="4" name="communication2"/>
-                                    <field name="name"/>
-                                    <field name="state"/>
-                                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                                 </page>
                                 <page string="Information">
-
-                                    <separator colspan="4" string="General Information"/>
-                                    <group colspan="2">
-                                        <field name="amount"/>
-                                        <field name="company_currency" nolabel="1"/>
+                                    <group col="4" string="General Information"/>
+                                        <label for="amount"/>
+                                        <div>
+                                            <field name="amount" class="oe_form_inline"/>
+                                            <field name="company_currency" class="oe_form_inline"/>
+                                        </div>
+                                        <separator colspan="4" string="Entry Information"/>
+                                        <field name="create_date" readonly="1"/>
+                                        <field name="ml_maturity_date"/>
+                                        <field name="ml_inv_ref"/>
                                     </group>
-                                    <separator colspan="4" string="Entry Information"/>
-                                    <field name="create_date" readonly="1"/>
-                                    <field name="ml_maturity_date"/>
-                                    <field name="ml_inv_ref"/>
                                 </page>
                             </notebook>
                         </form>
@@ -245,36 +252,39 @@
                 <form string="Payment Line">
                     <notebook>
                         <page string="Payment">
-                            <field name="order_id" select="1"/>
-                            <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
-                            <separator colspan="4" string="Transaction Information"/>
-                            <field name="date"/>
-                            <group colspan="2">
-                                <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
-                                <field name="currency" nolabel="1"/>
-                            </group>
-                            <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
-                            <separator colspan="2" string="Owner Account"/>
-                            <separator colspan="2" string="Desitination Account"/>
-                            <field colspan="2" name="info_owner" nolabel="1"/>
-                            <field colspan="2" name="info_partner" nolabel="1"/>
+                            <group col="4">
+                                <field name="order_id"/>
+                                <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
+                                <separator colspan="4" string="Transaction Information"/>
+                                <field name="date"/>
+                                <label for="amount_currency"/>
+                                <div>
+                                    <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
+                                    <field name="currency" class="oe_form_inline"/>
+                                </div>
+                                <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
+                                <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
+                                <separator colspan="2" string="Owner Account"/>
+                                <separator colspan="2" string="Desitination Account"/>
+                                <field colspan="2" name="info_owner" nolabel="1"/>
+                                <field colspan="2" name="info_partner" nolabel="1"/>
 
-                            <field colspan="4" name="communication"/>
-                            <field colspan="4" name="communication2"/>
-                            <field name="name"/>
-                             <field name="state"/>
+                                <field colspan="4" name="communication"/>
+                                <field colspan="4" name="communication2"/>
+                                <field name="name"/>
+                                <field name="state"/>
+                            </group>
                         </page>
                         <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <group colspan="2">
-                                <field name="amount" select="1"/>
+                            <group col="4" string="General Information">
+                                <field name="amount"/>
                                 <field name="company_currency" nolabel="1"/>
                             </group>
-                            <separator colspan="4" string="Entry Information"/>
-                            <field name="create_date"/>
-                            <field name="ml_maturity_date"/>
-                            <field name="ml_inv_ref"/>
+                            <group col="4" string="Entry Information">
+                                <field name="create_date"/>
+                                <field name="ml_maturity_date"/>
+                                <field name="ml_inv_ref"/>
+                            </group>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index fe282138a72..3b7caa4dab6 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -26,10 +26,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Voucher Lines">
-                    <field name="name"/>
-                    <field name="account_id"/>
-                    <field name="partner_id"/>
-                    <field name="amount"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="account_id"/>
+                        <field name="partner_id"/>
+                        <field name="amount"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -39,16 +41,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                   <header>
                       <button name="proforma_voucher" string="Post" states="draft"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
                       <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                       <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                      <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </header>
-                  <sheet string="Accounting Voucher" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
+                  <sheet string="Accounting Voucher">
+                    <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
@@ -60,7 +62,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
-                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Voucher Items" editable="bottom">
                                     <field name="account_id"/>
                                     <field name="name"/>
@@ -69,29 +71,29 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <group col="2" colspan="1" >
-                                    <separator string="Other Information" colspan="2"/>
+                            <group col="3">
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group string="Other Information">
                                     <field name="number"/>
                                     <field name="currency_id"/>
                                 </group>
-                                <group col="4" colspan="1" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
+                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                    <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 colspan="1" string=""/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                            <group col="6" colspan="4">
+                            <group col="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                            <field name="move_ids" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
                                    <field name="ref"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 6b2af93bc62..79e103e6a85 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -73,7 +73,7 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Bill Payment">
-                    <group col="6" colspan="4">
+                    <group col="6">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" />
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
@@ -90,7 +90,7 @@
                         <field name="pre_line" invisible="1"/>
                         <field name="type" invisible="True"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Payment Information">
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
@@ -106,7 +106,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -120,17 +120,17 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="4" colspan="1">
-                                <separator string="Other Information" colspan="4"/>
-                                <field name="currency_id" colspan="4"/>
-                                <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
-                                <field name="number" colspan="4"/>
+                            <group>
+                                <group string="Internal Notes">
+                                    <field name="narration" nolabel="1" colspan="2"/>
+                                </group>
+                                <group string="Other Information" col="4">
+                                    <field name="currency_id" colspan="4"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                    <field name="number" colspan="4"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -143,16 +143,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
-                <sheet string="Bill Payment" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
+                <sheet string="Bill Payment">
+                    <group col="6">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
@@ -172,9 +172,9 @@
                         <field name="type" invisible="True"/>
                         <field name="currency_id" invisible="1" colspan="4"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Payment Information">
-                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -190,7 +190,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -206,39 +206,40 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                    <separator string="Currency Options" colspan="4"/>
-                                    <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                            <group>
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="2" colspan="1">
-                                    <separator string="Payment Options" colspan="2"/>
-                                    <field name="writeoff_amount"/>
-                                    <field name="payment_option" required="1"/>
-                                    <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
+                                <group>
+                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="4"/>
+                                        <field name="is_multi_currency" invisible="1"/>
+                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                    </group>
+                                    <group col="2">
+                                        <separator string="Payment Options" colspan="2"/>
+                                        <field name="writeoff_amount"/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
                                 </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                            <group col="6" colspan="4">
+                            <group col="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
+                                <field name="number"/>
                             </group>
-                            <field name="number" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                            <field name="move_ids" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
                                    <field name="ref"/>
@@ -294,16 +295,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
-                <sheet string="Customer Payment" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
+                <sheet>
+                    <group col="6">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
@@ -326,9 +327,9 @@
                         <field name="pre_line" invisible="1"/>
                         <field name="type" invisible="True"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Payment Information">
-                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -344,7 +345,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -360,19 +361,18 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                            <group col="3">
+                                <group col="2" string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group col="2" colspan="1">
+                                <group col="2">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
@@ -387,12 +387,12 @@
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                            <group col="6" colspan="4">
+                            <group col="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
+                                <field name="number"/>
                             </group>
-                            <field name="number" colspan="4"/>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                            <field name="move_ids" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
                                    <field name="ref"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5134c55c2a8..bad68fd1634 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,17 +80,17 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
+                    <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)"/>
@@ -100,9 +100,9 @@
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Sales Information">
-                            <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
                                     <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
@@ -110,12 +110,11 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <group col="2" colspan="1">
+                            <group col="3">
+                                <group string="Internal Notes" col="1">
+                                    <field name="narration"/>
+                                </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"
@@ -128,7 +127,7 @@
                                     <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                                     <field name="paid" invisible="1"/>
                                 </group>
-                                <group col="4" colspan="1">
+                                <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"/>
@@ -136,11 +135,11 @@
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                            <group col="6" colspan="4">
+                            <group col="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                            <field name="move_ids" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
                                    <field name="ref"/>
@@ -206,18 +205,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
-                <sheet string="Supplier Voucher" layout="auto">
+                <sheet string="Supplier Voucher">
                     <field name="pay_now" invisible="1"/>
-                    <group col="6" colspan="4" class="oe_form_header">
+                    <group col="6">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                         <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -231,7 +230,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
-                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
                                     <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
@@ -239,17 +238,16 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="2" colspan="3">
-                                <separator string="Internal Notes" colspan="2"/>
-                                <field name="narration" colspan="2" nolabel="1"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <group col="2" colspan="1">
+                            <group col="3">
+                                <group col="1" string="Internal Notes">
+                                    <field name="narration"/>
+                                </group>
+                                <group col="2">
                                     <separator string="Payment Terms" colspan="2"/>
                                     <field name="date_due"/>
                                     <field name="paid" invisible="1"/>
                                 </group>
-                                <group col="4" colspan="1">
+                                <group col="4">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','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"/>
@@ -257,11 +255,11 @@
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                            <group col="6" colspan="4">
+                            <group col="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
-                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                            <field name="move_ids" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
                                    <field name="ref"/>
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index c9b424d190b..7f5a2226bdd 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -10,7 +10,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymized Field">
-                <group colspan="4" col="8">
+                <group col="4">
                     <field name="model_id" select="1" on_change="onchange_model_id(model_id)" />
                     <field name="model_name" select="1" on_change="onchange_model_name(model_name)" />
                     <field name="field_id"
@@ -18,8 +18,8 @@
                            on_change="onchange_field_id(field_id, model_name)"
                            domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
                     <field name="field_name" select="1" on_change="onchange_field_name(field_name, model_name)" />
+                    <field name="state" />
                 </group>
-                <field name="state" />
             </form>
         </field>
     </record>
@@ -56,27 +56,23 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Database Anonymization">
-                <label string="Summary" />
-                <newline />
-                <group colspan="4" col="4">
-                    <field name="summary" nolabel="1" readonly="0" width="400" />
-                </group>
-                <newline />
-                <group name="placeholder1">
+                <header>
+                    <button name="anonymize_database"
+                            string="Anonymize Database"
+                            type="object"
+                            states="clear" />
+                    <button name="reverse_anonymize_database"
+                            string="Reverse the Database Anonymization"
+                            type="object"
+                            states="anonymized" />
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <field name="summary" readonly="0"/>
+                <group name="placeholder1" col="4">
                     <field name="file_export" />
                     <field name="file_import" />
                     <field name="msg" />
                 </group>
-                <button name="anonymize_database"
-                        string="Anonymize Database"
-                        type="object"
-                        states="clear" />
-                <button name="reverse_anonymize_database"
-                        string="Reverse the Database Anonymization"
-                        type="object"
-                        states="anonymized" />
-                        <newline />
-                <field name="state" />
             </form>
         </field>
     </record>
@@ -106,19 +102,17 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymization History">
-                <group colspan="4" col="16">
-                    <field name="date" select="1" colspan="1" />
-                    <field name="state" select="1" colspan="1" />
-                    <field name="filepath" colspan="7" />
-                    <field name="direction" colspan="3" />
+                <group col="4">
+                    <field name="date"/>
+                    <field name="state"/>
+                    <field name="filepath"/>
+                    <field name="direction"/>
                 </group>
-                <group colspan="4" col="2">
-                    <label string="Message" />
-                    <field name="msg" nolabel="1" colspan="4" readonly="0" height="150" />
+                <group string="Message" col="1">
+                    <field name="msg" nolabel="1" readonly="0"/>
                 </group>
-                <group colspan="4" col="2">
-                    <label string="Fields" />
-                    <field name="field_ids" nolabel="1" colspan="4" height="300">
+                <group string="Fields" col="1">
+                    <field name="field_ids" nolabel="1">
                         <tree>
                             <field name="model_id" />
                             <field name="field_id" />
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 35f8b7babd1..786b0a495d3 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,23 +12,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Rule">
-                    <field name="name" select="1" required="1"/>
-                    <field name="object_id" select="1"/>
-                    <field name="log_read"/>
-                    <field name="log_write"/>
-                    <field name="log_unlink"/>
-                    <field name="log_create"/>
-                    <field name="log_action"/>
-                    <field name="log_workflow"/>
-                    <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
-                    <field name="user_id" select="1" colspan="4" nolabel="1" />
-                    <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
-                    <field name="state" select="1" readonly="1" />
-                    <group colspan="2" col="2">
+                    <header>
                         <button string="_Subscribe" name="subscribe" icon="gtk-ok"
                             type="object" states="draft" />
                         <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
                             type="object" states="subscribed" />
+                        <field name="state" widget="statusbar"/>
+                    </header>
+                    <group col="4">
+                        <field name="name" select="1" required="1"/>
+                        <field name="object_id" select="1"/>
+                        <field name="log_read"/>
+                        <field name="log_write"/>
+                        <field name="log_unlink"/>
+                        <field name="log_create"/>
+                        <field name="log_action"/>
+                        <field name="log_workflow"/>
+                        <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
+                        <field name="user_id" select="1" colspan="4" nolabel="1" />
+                        <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
                 </form>
             </field>