From dcc975b79a19eef3d95836bc7bcc8c6ae343aabd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Jun 2012 15:50:41 +0200
Subject: [PATCH] [IMP] better views, mostly accoung wizards form

bzr revid: fp@tinyerp.com-20120609135041-570vyqpa9m2f1huw
---
 addons/account/account_invoice_view.xml       |   4 +-
 addons/account/account_view.xml               | 100 +++++++++---------
 addons/account/board_account_view.xml         |   2 +-
 addons/account/partner_view.xml               |   8 +-
 addons/account/project/project_view.xml       |  10 +-
 .../account_analytic_balance_report_view.xml  |   2 +-
 .../wizard/account_analytic_chart_view.xml    |   2 +-
 ...ic_cost_ledger_for_journal_report_view.xml |   2 +-
 .../account_analytic_cost_ledger_view.xml     |   2 +-
 ...count_analytic_inverted_balance_report.xml |   2 +-
 .../account_analytic_journal_report_view.xml  |   2 +-
 .../project_account_analytic_line_view.xml    |   4 +-
 addons/account/report/account_report_view.xml |  70 ++++++------
 addons/account/res_config_view.xml            |   2 +-
 .../account_automatic_reconcile_view.xml      |  38 +++----
 .../wizard/account_change_currency_view.xml   |  12 +--
 addons/account/wizard/account_chart_view.xml  |  11 +-
 .../wizard/account_fiscalyear_close_state.xml |  20 ++--
 .../wizard/account_fiscalyear_close_view.xml  |  34 +++---
 .../wizard/account_invoice_refund_view.xml    |  24 ++---
 .../wizard/account_invoice_state_view.xml     |   4 +-
 .../wizard/account_journal_select_view.xml    |  15 ++-
 .../account_move_bank_reconcile_view.xml      |  14 ++-
 addons/account/wizard/account_move_journal.py |  17 ++-
 ...ccount_move_line_reconcile_select_view.xml |  14 ++-
 .../wizard/account_move_line_select_view.xml  |   9 +-
 ...ount_move_line_unreconcile_select_view.xml |  14 ++-
 .../account_open_closed_fiscalyear_view.xml   |  12 +--
 .../wizard/account_period_close_view.xml      |  16 ++-
 ...account_reconcile_partner_process_view.xml |  18 ++--
 .../account/wizard/account_reconcile_view.xml |  44 ++++----
 ...count_report_aged_partner_balance_view.xml |  33 +++---
 .../wizard/account_report_common_view.xml     |  47 ++++----
 .../wizard/account_state_open_view.xml        |  14 ++-
 .../account_subscription_generate_view.xml    |  23 ++--
 .../account/wizard/account_tax_chart_view.xml |  18 ++--
 .../wizard/account_unreconcile_view.xml       |  36 +++----
 .../account/wizard/account_use_model_view.xml |  30 +++---
 .../wizard/account_validate_move_view.xml     |  32 +++---
 addons/account/wizard/account_vat_view.xml    |  28 ++---
 .../account_analytic_default_view.xml         |   2 +-
 .../account_analytic_plans_view.xml           |  24 ++---
 .../account_crossovered_analytic_view.xml     |  35 +++---
 .../analytic_plan_create_model_view.xml       |  42 +++-----
 addons/account_asset/account_asset_view.xml   |   6 +-
 .../account_asset_change_duration_view.xml    |   2 +-
 .../wizard/wizard_asset_compute_view.xml      |  23 ++--
 .../account_bank_statement_view.xml           |   4 +-
 .../wizard/cancel_statement_line_wizard.xml   |  15 +--
 .../wizard/confirm_statement_line_wizard.xml  |  18 ++--
 addons/account_budget/account_budget_view.xml |  30 +++---
 .../wizard/account_budget_analytic_view.xml   |  60 +++++------
 ...account_budget_crossovered_report_view.xml |  60 +++++------
 ...budget_crossovered_summary_report_view.xml |  60 +++++------
 .../wizard/account_budget_report_view.xml     |  16 +--
 addons/account_coda/account_coda_view.xml     |  24 ++---
 addons/account_coda/account_coda_wizard.xml   |  37 ++++---
 .../account_followup_view.xml                 |   4 +-
 58 files changed, 603 insertions(+), 648 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bc18aa72f4b..f49fac1607f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -50,7 +50,7 @@
             <field name="model">account.invoice.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Line">
+                <form string="Invoice Line" version="7.0">
                     <group col="4">
                         <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         <field name="name"/>
@@ -94,7 +94,7 @@
             <field name="model">account.invoice.tax</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manual Invoice Taxes">
+                <form string="Manual Invoice Taxes" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1a30a7b5998..9138dee0e6c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -11,11 +11,11 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
-                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                    <field name="state" widget="statusbar" nolabel="1" />
                 </header>
                 <sheet string="Fiscalyear" layout="auto">
                     <group>
@@ -31,7 +31,7 @@
                         </group>
                     </group>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period">
+                        <form string="Period" version="7.0">
                             <group col="4">
                                 <field name="name"/>
                                 <field name="code"/>
@@ -98,7 +98,7 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <field name="state" widget="statusbar" nolabel="1"/>
@@ -169,7 +169,7 @@
             <field name="model">account.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account">
+                <form string="Account" version="7.0">
                     <label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
                     <h1>
                         <field name="name"/> - 
@@ -354,7 +354,7 @@
             <field name="model">account.journal.column</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Column">
+                <form string="Journal Column" version="7.0">
                     <field name="name"/>
                     <field name="field"/>
                     <field name="sequence"/>
@@ -398,7 +398,7 @@
             <field name="model">account.journal.view</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal View">
+                <form string="Journal View" version="7.0">
                     <field name="name"/>
                     <field name="columns_id"/>
                 </form>
@@ -464,7 +464,7 @@
             <field name="model">account.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Journal">
+                <form string="Account Journal" version="7.0">
                     <div class="oe_form_title">
                         <label for="name" class="oe_form_readonly_hidden"/>
                         <h1><field name="name"/></h1>
@@ -587,7 +587,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
+                <form string="Bank Statement" version="7.0">
                 <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
@@ -598,8 +598,8 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
+                            <field name="date" on_change="onchange_date(date, company_id)"/>
+                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                             <field name="period_id"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group><group>
@@ -623,7 +623,7 @@
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
+                                <form string="Statement lines" version="7.0">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
@@ -716,7 +716,7 @@
             <field name="model">account.account.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Type">
+                <form string="Account Type" version="7.0">
                     <group>
                         <group>
                             <field name="name"/>
@@ -771,7 +771,7 @@
             <field name="model">account.move.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Reconcile">
+                <form string="Journal Entry Reconcile" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="create_date"/>
@@ -822,7 +822,7 @@
             <field name="model">account.tax.code</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code">
+                <form string="Account Tax Code" version="7.0">
                     <group>
                         <group col="4" colspan="2">
                             <field name="name"/>
@@ -893,7 +893,7 @@
             <field name="model">account.tax</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax">
+                <form string="Account Tax" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
@@ -1010,11 +1010,11 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item">
+                <form string="Journal Item" version="7.0">
                     <group col="6">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="ref"/>
-                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
                         <field name="journal_id"/>
                         <field name="period_id"/>
@@ -1084,16 +1084,16 @@
             <field name="type">form</field>
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item">
+                <form string="Journal Item" version="7.0">
                     <notebook colspan="4">
                         <page string="Information">
                             <group col="4">
                                 <separator colspan="4" string="General Information"/>
-                                <field name="name" select="1"/>
+                                <field name="name"/>
                                 <field name="date"/>
-                                <field name="journal_id" readonly="False" select="1"/>
+                                <field name="journal_id" readonly="False"/>
                                 <field name="period_id" readonly="False"/>
-                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
+                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
                                 <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                                 <newline/>
                                 <field name="debit"/>
@@ -1102,13 +1102,13 @@
                                 <separator colspan="4" string="Optional Information"/>
                                 <field name="currency_id"/>
                                 <field name="amount_currency"/>
-                                <field name="quantity" select="3"/>
+                                <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
                                 <field name="date_maturity"/>
                                 <field name="date_created"/>
                                 <field name="date_created"/>
-                                <field name="blocked" select="3"/>
+                                <field name="blocked"/>
                                 <newline/>
                                 <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                 <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
@@ -1268,7 +1268,7 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
@@ -1292,7 +1292,7 @@
                             <field colspan="4" name="line_id" widget="one2many_list" 
                               on_change="onchange_line_id(line_id)"
                               context="{'balance': balance , 'journal': journal_id }">
-                                <form string="Journal Item">
+                                <form string="Journal Item" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
@@ -1567,7 +1567,7 @@
             <field name="model">account.model.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model Line">
+                <form string="Journal Entry Model Line" version="7.0">
                     <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
@@ -1588,7 +1588,7 @@
             <field name="model">account.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model">
+                <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal_id"/>
@@ -1675,8 +1675,8 @@
             <field name="model">account.payment.term.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Term">
-                    <field name="name" select="1"/>
+                <form string="Payment Term" version="7.0">
+                    <field name="name"/>
                     <field name="sequence"/>
                     <group>
                         <group string="Amount Computation">
@@ -1726,7 +1726,7 @@
             <field name="model">account.payment.term</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Term">
+                <form string="Payment Term" version="7.0">
                     <group>
                         <field name="name"/>
                         <field name="active"/>
@@ -1758,7 +1758,7 @@
             <field name="model">account.subscription.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription lines">
+                <form string="Subscription lines" version="7.0">
                     <group>
                         <field name="date"/>
                         <field name="move_id"/>
@@ -1822,7 +1822,7 @@
             <field name="model">account.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Recurring">
+                <form string="Recurring" version="7.0">
                     <header>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                         <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
@@ -1889,7 +1889,7 @@
             <field name="type">form</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Subscription lines">
+                <form string="Subscription lines" version="7.0">
                     <group col="4">
                         <field name="subscription_id"/>
                         <field name="date"/>
@@ -1981,7 +1981,7 @@
             <field name="model">account.addtmpl.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Account">
+                <form string="Create Account" version="7.0">
                     <header>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
@@ -2023,7 +2023,7 @@
             <field name="model">account.account.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Template">
+                <form string="Account Template" version="7.0">
                     <notebook>
                         <page string="General Information">
                             <group col="4">
@@ -2106,7 +2106,7 @@
             <field name="model">account.chart.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Chart of Accounts Template">
+                <form string="Chart of Accounts Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
@@ -2191,7 +2191,7 @@
             <field name="model">account.tax.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Template">
+                <form string="Account Tax Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
@@ -2321,7 +2321,7 @@
             <field name="model">account.tax.code.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code Template">
+                <form string="Account Tax Code Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -2353,7 +2353,7 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes">
+                <form position="attributes" version="7.0">
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
@@ -2371,7 +2371,7 @@
                     <field name ="complete_tax_set" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
-                        <form string="Bank Information">
+                        <form string="Bank Information" version="7.0">
                             <field name="acc_name"/>
                             <field name="account_type"/>
                             <field name="currency_id" widget="selection"/>
@@ -2453,7 +2453,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position Template">
+                <form string="Fiscal Position Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="chart_template_id"/>
@@ -2463,7 +2463,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Taxes Mapping">
+                        <form string="Taxes Mapping" version="7.0">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -2473,7 +2473,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Accounts Mapping">
+                        <form string="Accounts Mapping" version="7.0">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -2529,7 +2529,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
@@ -2560,7 +2560,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
+                                <form string="Statement lines" version="7.0">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
@@ -2585,7 +2585,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal" sum="Total"/>
                                     </tree>
-                                    <form string = "Opening Balance">
+                                    <form string = "Opening Balance" version="7.0">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal"/>
@@ -2597,7 +2597,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal" sum="Total"/>
                                     </tree>
-                                    <form string = "Closing Balance">
+                                    <form string = "Closing Balance" version="7.0">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal"/>
@@ -2689,7 +2689,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.financial.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Report">
+                <form string="Account Report" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 3037c9d3b0d..0f01be87a26 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -38,7 +38,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Board" layout="manual">
+                <form string="Account Board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 998140287ab..1515f80b35e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position">
+                <form string="Fiscal Position"/>
                     <group col="4">
                         <field name="name" select="1"/>
                         <field name="active"/>
@@ -19,7 +19,7 @@
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Tax Mapping">
+                        <form string="Tax Mapping" version="7.0">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -29,7 +29,7 @@
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Account Mapping">
+                        <form string="Account Mapping" version="7.0">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -93,7 +93,7 @@
                             <field name="debit"/>
                         </group>
                         <field name="bank_ids">
-                            <form string="Bank account">
+                            <form string="Bank account" version="7.0">
                                 <field name="state"/>
                                 <field name="acc_number"/>
                                 <group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 931b01ce7e1..3d6cace4ac5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,7 +80,7 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Account">
+                <form string="Analytic Account" version="7.0">
                 <sheet>
                     <group>
                         <group>
@@ -157,7 +157,7 @@
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Entry">
+                <form string="Analytic Entry" version="7.0">
                     <group>
                         <group>
                             <field name="name"/>
@@ -276,7 +276,7 @@
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project line">
+                <form string="Project line" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
@@ -343,7 +343,7 @@
             <field name="model">account.analytic.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Journal">
+                <form string="Analytic Journal" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -401,7 +401,7 @@
         <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
         <!--    <field name="type">form</field>-->
         <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Analytic Entries Stats">-->
+        <!--        <form string="Analytic Entries Stats" version="7.0">-->
         <!--            <group col="4">-->
         <!--                <field name="name"/>-->
         <!--                <field name="account_id"/>-->
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index ba26c23522e..59c4095bb22 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.balance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Select Period">
+            <form string="Select Period" version="7.0">
                 <header>
                     <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index af3f197902b..8e2351b63e9 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Account Charts">
+                <form string="Analytic Account Charts" version="7.0">
                     <header>
                         <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index bd18e2721f0..a9c868a6ac8 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.cost.ledger.journal.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select period">
+                <form string="Select period" version="7.0">
                     <header>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index fd3d2193637..29948e7b5c0 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.cost.ledger</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Select Period">
+            <form string="Select Period" version="7.0">
                 <header>
                      <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 3fea5004f33..5020a1859a6 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.inverted.balance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Period">
+                <form string="Select Period" version="7.0">
                     <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 9062919f575..d6c36aae990 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.journal.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Period">
+                <form string="Select Period" version="7.0">
                     <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 2046fac99f9..08ef0e8e9b6 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -7,14 +7,14 @@
             <field name="model">project.account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="View Account Analytic Lines">
+                <form string="View Account Analytic Lines" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
-                        <field name="to_date" />
+                        <field name="to_date"/>
                     </group>
                     <label string ="(Keep empty to open the current situation)" />
                 </form>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index fe2b8a3940a..587d068ca1b 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -34,9 +34,11 @@
             <field name="model">report.account.receivable</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Accounts by Type">
-                    <field name="name" select="1"/>
-                    <field name="type" select="1"/>
+                <form string="Accounts by Type" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="type"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -68,8 +70,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Aged Receivable">
-                    <field name="name" select="1"/>
-                    <field name="balance" select="2"/>
+                    <field name="name"/>
+                    <field name="balance"/>
                 </tree>
             </field>
         </record>
@@ -89,8 +91,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
-                   	<field name="create_date" select="1"/>
-                    <field name="name" select="1"/>
+                       <field name="create_date"/>
+                    <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
                     <field name="partner_id"/>
@@ -98,30 +100,30 @@
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="currency_id"/>
                     <field name="date_invoice"/>
-                    <field name="date_due" select="1"/>
+                    <field name="date_due"/>
                     <field name="residual"/>
-                    <field name="state" select="2"/>
+                    <field name="state"/>
                     <field name="origin"/>
                 </tree>
             </field>
         </record>
 
-	    <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
-		    <field name="name">Invoices Created Within Past 15 Days</field>
-		    <field name="res_model">report.invoice.created</field>
-		    <field name="view_type">form</field>
-		    <field name="view_mode">tree,form</field>
-		    <field name="view_id" ref="board_view_created_invoice"/>
-	    </record>
+        <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
+            <field name="name">Invoices Created Within Past 15 Days</field>
+            <field name="res_model">report.invoice.created</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="board_view_created_invoice"/>
+        </record>
 
-	    <record id="view_report_account_sales_tree" model="ir.ui.view">
+        <record id="view_report_account_sales_tree" model="ir.ui.view">
             <field name="name">report.account.sales.tree</field>
             <field name="model">report.account.sales</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
+                    <field name="name"/>
+                    <field name="month"/>
                     <field name="product_id"/>
                     <field name="account_id"/>
                     <field name="quantity"/>
@@ -149,11 +151,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-					<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
+                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
+                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
@@ -166,7 +168,7 @@
             <field name="search_view_id" ref="view_report_account_sales_search"/>
         </record>
 
-	    <record id="view_report_account_type_sales_tree" model="ir.ui.view">
+        <record id="view_report_account_type_sales_tree" model="ir.ui.view">
             <field name="name">report.account_type.sales.tree</field>
             <field name="model">report.account_type.sales</field>
             <field name="type">tree</field>
@@ -190,9 +192,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account Type">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="product_id" select="1"/>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="product_id"/>
                 </tree>
             </field>
         </record>
@@ -209,17 +211,17 @@
              </field>
         </record>
 
-		<record id="view_report_account_type_sales_search" model="ir.ui.view">
+        <record id="view_report_account_type_sales_search" model="ir.ui.view">
             <field name="name">report.account_type.sales.search</field>
             <field name="model">report.account_type.sales</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-					<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
+                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index e75bebb88bd..24c7887bdfe 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -15,7 +15,7 @@
             <field name="model">account.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Accounting">
+                <form string="Configure Accounting" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9835ab47696..b8e719acc35 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -7,28 +7,24 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <separator string="Reconciliation" colspan="4"/>
-                    <label colspan="4" nolabel="1" string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
-                    <newline/>
-                    <group>
-                        <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+                <form string="Reconciliation" version="7.0">
+                    <header>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <separator string="Reconciliation"/>
+                    <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
+                    <field name="account_ids" domain="[('reconcile','=',1)]"/>
+                    <group col="4">
                         <field name="power"/>
                         <field name="allow_write_off"/>
                     </group>
-                    <newline/>
-                    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
-                        <separator string="Write-Off Move" colspan="4"/>
+                    <group col="4" attrs="{'readonly':[('allow_write_off', '!=', True)]}" string="Write-Off Move">
                         <field name="max_amount"/>
                         <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
-                    <separator string ="" colspan="4"/>
-                    <group colspan="2" col="4">
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
-                     </group>
                 </form>
              </field>
          </record>
@@ -56,14 +52,14 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Reconciliation Result">
-                    <field name="reconciled"/>
-                    <newline/>
-                    <field name="unreconciled"/>
-                    <group colspan="4" col="6">
-                        <separator colspan="6"/>
+                <form string="Reconciliation Result" version="7.0">
+                    <header>
                         <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
-                     </group>
+                    </header>
+                    <group>
+                        <field name="reconciled"/>
+                        <field name="unreconciled"/>
+                    </group>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 4504f064a1d..3c8a9473530 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -6,13 +6,13 @@
             <field name="model">account.change.currency</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Currency">
-                    <separator colspan="4" string="This wizard will change the currency of the invoice"/>
-                    <field name="currency_id"/>
-                    <separator colspan="4"/>
-                    <group colspan="2" col="4">
-                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                <form string="Invoice Currency" version="7.0">
+                    <header>
                         <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                    <header>
+                    <group string="This wizard will change the currency of the invoice">
+                        <field name="currency_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index f2e278b06ce..1ae294c3c0a 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -6,7 +6,11 @@
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account charts">
+                <form string="Account charts" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -15,11 +19,6 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 5bd537fea1b..e141b4fc911 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -6,16 +6,16 @@
             <field name="model">account.fiscalyear.close.state</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close states of Fiscal year and periods">
-                        <separator string="Close states of Fiscal year and periods" colspan="4" />
-						<label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive " colspan="4"/>
-						<newline/>
-						<field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
-						<separator colspan="4" />
-						<group colspan="4" col="6">
-						    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-						    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-						</group>
+                <form string="Close states of Fiscal year and periods" version="7.0">
+                <header>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+                </header>
+                <separator string="Close states of Fiscal year and periods"/>
+                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
+                <group>
+                    <field name="fy_id"  domain="[('state','=','draft')]"/>
+                </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index d4dfab7876c..00cf6c09628 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -6,23 +6,23 @@
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Generate Fiscal Year Opening Entries">
-	                <separator string="Generate Fiscal Year Opening Entries" colspan="4"/>
-	                <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
-	                <newline/>
-	                <field name="fy_id" domain = "[('state','=','draft')]"/>
-	                <field name="fy2_id" domain = "[('state','=','draft')]"/>
-	                <field name="journal_id"/>
-	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
-	                <field name="report_name" colspan="4"/>
-	                <separator colspan="4"/>
-	                <group colspan="4" col="6">
-	                   <label string="" colspan="2"/>
-	                   <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-	                   <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-	                </group>
-				</form>
-			</field>
+                <form string="Generate Fiscal Year Opening Entries" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <header>
+                    <separator string="Generate Fiscal Year Opening Entries"/>
+                    <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
+                    <newline/>
+                    <group col="4">
+                        <field name="fy_id" domain = "[('state','=','draft')]"/>
+                        <field name="fy2_id" domain = "[('state','=','draft')]"/>
+                        <field name="journal_id"/>
+                        <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
+                        <field name="report_name"/>
+                    </group>
+                </form>
+            </field>
         </record>
 
         <record id="action_account_fiscalyear_close" model="ir.actions.act_window">
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 57edd62f575..b631bc5592f 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,26 +7,22 @@
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Credit Note">
-                    <separator string="Credit Note Options" colspan="4"/>
-                    <group colspan="4" >
+                <form string="Credit Note" version="7.0" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
+                    <header>
+                    <separator string="Credit Note Options"/>
+                    <group col="4">
                          <field name="description"/>
                          <field name="journal_id" widget='selection'/>
                          <field name="date"/>
                          <field name="period"/>
                          <field name="filter_refund"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4" fill="1">
-                    	<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                        <label align="0.0" width="300" string="Credit Note: Creates the credit note, ready for editing."/>
-                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
-                   </group>
+                    <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
+                    <label string="Credit Note: Creates the credit note, ready for editing."/>
+                    <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index a1fd5dc3673..d95889a6558 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Confirm Draft Invoices">
+            <form string="Confirm Draft Invoices" version="7.0">
                 <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
@@ -27,7 +27,7 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Cancel Selected Invoices">
+            <form string="Cancel Selected Invoices" version="7.0">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index abd596c2f24..d39e4455dd3 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,13 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Journal Select">
-                    <label string="Are you sure you want to open Journal Entries?" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
-                   </group>
-               </form>
+            <form string="Journal Select" version="7.0">
+                <header>
+                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <header>
+                <label string="Are you sure you want to open Journal Entries?"/>
+            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 72680a59725..f1e4a5fd6f6 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.bank.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank reconciliation">
-                    <group colspan="4" >
+                <form string="Bank reconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <header>
+                    <group>
                         <field name="journal_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
-                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index a7d4f36916b..8c7a62a2281 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,20 +107,19 @@ class account_move_journal(osv.osv_memory):
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries">
-                <separator string="%s" colspan="4"/>
-                <field name="target_move" />
-                <newline/>
+                <header>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="%s"/>
+                </header>
+                <group string="%s" colspan="4">
+                    <field name="target_move" />
+                </group>
                 <group colspan="4" >
                     <label width="300" string="%s"/>
                     <newline/>
                     <label width="300" string="%s"/>
                 </group>
-                <group colspan="4" col="4">
-                    <label string ="" colspan="2"/>
-                    <button icon="gtk-cancel" special="cancel" string="%s"/>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
-                </group>
-            </form>""" % (separator_string, journal_string, period_string, cancel_string, open_string)
+            </form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 93e8c9a04b1..c2047920c4a 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.line.reconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <group colspan="4" >
+                <form string="Reconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    <header>
+                    <group>
                          <field name="account_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index ae6c9e572d1..519682631e3 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -7,13 +7,12 @@
             <field name="model">account.move.line.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Select">
-                    <label string="Are you sure you want to open Account move line entries!" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
+                <form string="Account Select" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
-                   </group>
+                    <header>
+                    <label string="Are you sure you want to open Account move line entries!"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 31183f84c82..c74befe700c 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.line.unreconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Unreconciliation">
-                    <group colspan="4" >
+                <form string="Unreconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    <header>
+                    <group>
                         <field name="account_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a7e35390c46..5eb42f7ce7a 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -6,15 +6,13 @@
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Choose Fiscal Year ">
-                    <group colspan="4" >
-                        <field name="fyear_id"  domain = "[('state','=','draft')]"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Choose Fiscal Year " version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                    <header>
+                    <group>
+                        <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 49f6c9cdbb1..1dd19bffd0d 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -7,17 +7,15 @@
             <field name="model">account.period.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close Period">
-                    <group colspan="4" >
-                        <separator string="Are you sure?" colspan="4"/>
-                        <field name="sure"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Close Period" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
-                   </group>
+                    <header>
+                    <separator string="Are you sure?" colspan="4"/>
+                    <group>
+                        <field name="sure"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index cc6cf96ac7c..c063581be5e 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -6,16 +6,16 @@
             <field name="model">account.partner.reconcile.process</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Reconciliation">
-                    <field name="progress" widget="progressbar" colspan="4"/>
-                    <field name="today_reconciled"/>
-                    <field name="to_reconcile"/>
-                    <newline/>
-                    <field name="next_partner_id" colspan="4"/>
-                    <newline/>
-                    <group colspan="4" col="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Partner Reconciliation" version="7.0">
+                    <header>
                         <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <group col="4">
+                        <field name="next_partner_id"/>
+                        <field name="progress" widget="progressbar" colspan="4"/>
+                        <field name="today_reconciled"/>
+                        <field name="to_reconcile"/>
                     </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index c2e0fec7bae..3d374cad2e9 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -7,21 +7,21 @@
             <field name="model">account.move.line.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <separator string="Reconciliation Transactions" colspan="4"/>
-                    <field name="trans_nbr"/>
-                    <newline/>
-                    <field name="credit"/>
-                    <field name="debit"/>
-                    <separator string="Write-Off" colspan="4"/>
-                    <field name="writeoff"/>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Reconciliation" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
                         <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
                         <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                   </group>
+                    <header>
+                    <group col="4" string="Reconciliation Transactions">
+                        <field name="trans_nbr"/>
+                        <newline/>
+                        <field name="credit"/>
+                        <field name="debit"/>
+                    </group><group string="Write-Off"/>
+                        <field name="writeoff"/>
+                    </group>
                </form>
             </field>
         </record>
@@ -49,18 +49,18 @@
             <field name="model">account.move.line.reconcile.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Information addendum">
-                    <separator string="Write-Off Move" colspan="4"/>
-                    <field name="journal_id"/>
-                    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
-                    <field name="date_p"/>
-                    <field name="comment"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <form string="Information addendum" version="7.0">
+                    <header>
                         <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
-                   </group>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <header>
+                    <group string="Write-Off Move" col="4">
+                        <field name="journal_id"/>
+                        <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+                        <field name="date_p"/>
+                        <field name="comment"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index bd54b925eea..d6db4ff0e6c 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -8,24 +8,23 @@
             <field name="type">form</field>
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
-                <form string="Report Options">
-                    <separator colspan="4" string="Aged Partner Balance"/>
-                    <label colspan="4" nolabel="1" string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
-                    <newline/>
-                    <field name="chart_account_id" widget='selection'/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="period_length"/>
-                    <newline/>
-                    <field name="result_selection"/>
-                    <field name="direction_selection"/>
-                    <field name="journal_ids" required="0" invisible="1"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                <form string="Report Options" version="7.0">
+                    <header>
                         <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
-                     </group>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                    <header>
+                    <separator string="Aged Partner Balance"/>
+                    <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
+                    <group col="4">
+                        <field name="chart_account_id" widget='selection'/>
+                        <newline/>
+                        <field name="date_from"/>
+                        <field name="period_length"/>
+                        <newline/>
+                        <field name="result_selection"/>
+                        <field name="direction_selection"/>
+                    </group>
+                    <field name="journal_ids" required="0" invisible="1"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index db1da8223d5..d10b90cca14 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -7,32 +7,35 @@
             <field name="model">account.common.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Report Options">
-                  <label nolabel="1" string=""/>
-                  <newline/>
+            <form string="Report Options" version="7.0">
+                <header>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
+                    <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                <header>
+                <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
                    <field name="company_id" invisible="1"/>
                    <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
                    <field name="target_move"/>
-                       <notebook tabpos="up" colspan="4">
-                            <page string="Filters" name="filters">
-                                <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
-                                    <separator string="Dates" colspan="4"/>
-                                    <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
-                                    <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
-                                    <separator string="Periods"  colspan="4"/>
-                                    <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                                    <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                            </page>
-                            <page string="Journals" name="journal_ids">
-                                <field name="journal_ids" colspan="4" nolabel="1"/>
-                            </page>
-                        </notebook>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
-                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
-                    </group>
+                </group>
+                <notebook tabpos="up" colspan="4">
+                    <page string="Filters" name="filters">
+                        <group col="4">
+                            <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
+                        </group>
+                        <group string="Dates" col="4"/>
+                            <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+                            <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                        </group>
+                        <group string="Periods" col="4"/>
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                        </group>
+                    </page>
+                    <page string="Journals" name="journal_ids">
+                        <field name="journal_ids"/>
+                    </page>
+                </notebook>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index d3b68cb5186..71f1dd667e7 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -7,15 +7,13 @@
             <field name="model">account.state.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                    <form string="Open Invoice">
-                    <label string="Are you sure you want to open this invoice ?"/>
-                    <newline/>
-                    <label string="(Invoice should be unreconciled if you want to open it)"/>
-                    <separator colspan="4"/>
-                    <group colspan="2" col="4">
-                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                <form string="Open Invoice" version="7.0">
+                    <header>
                         <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/>
-                    </group>
+                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                    <header>
+                    <label string="Are you sure you want to open this invoice ?"/>
+                    <label string="(Invoice should be unreconciled if you want to open it)"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 7d61af62fb9..efb162a71aa 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -7,18 +7,17 @@
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Compute">
-                    <separator string="Generate Entries before:" colspan="4"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date." colspan="4" nolabel="1"/>
-                    <newline/>
-                    <field name="date"/>
-                	<separator colspan="4" />
-                	<group colspan="4" col="6">
-                		<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="gtk-execute" string="Generate Entries"
-                    	name="action_generate" type="object" />
-                	</group>
+                <form string="Subscription Compute" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-execute" string="Generate Entries"
+                            name="action_generate" type="object" />
+                    <header>
+                    <separator string="Generate Entries before:"/>
+                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
+                    <group>
+                        <field name="date"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index a4f5860d41f..ba1eee8f7d8 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -7,17 +7,15 @@
             <field name="model">account.tax.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account tax charts">
-                    <group colspan="4" >
-                        <field name="period_id"/>
-                        <label align="0.7" colspan="6" string="(If you do not select period it will take all open periods)"/>
-                        <field name="target_move"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                <form string="Account tax charts" version="7.0">
+                    <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    <header>
+                    <group>
+                        <field name="period_id"/>
+                        <label colspan="4" string="(If you do not select period it will take all open periods)"/>
+                        <field name="target_move"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 543fb9fcde6..ecd399d585a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -7,16 +7,14 @@
             <field name="model">account.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Unreconciliation">
-                <separator string="Unreconciliate Transactions" colspan="4"/>
-                <image name="terp-referer"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/>
-                <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
-                   </group>
-               </form>
+            <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+            </form>
             </field>
         </record>
 
@@ -43,16 +41,14 @@
             <field name="model">account.unreconcile.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Unreconciliation">
-                <separator string="Unreconciliation Transactions" colspan="4"/>
-                <image name="gtk-dialog-info"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-                <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
-                   </group>
-               </form>
+            <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <header>
+                <separator string="Unreconciliation Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index c26a81277aa..bb8f4d59694 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -7,15 +7,16 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create Entries From Models">
-                    <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <label string="Create manual recurring entries in a chosen journal." width="400"/>
-                    <field name="model" colspan="4" nolabel="1"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    </group>
+            <form string="Create Entries From Models" version="7.0">
+                <header>
+                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <header>
+                <separator string="This wizard will create recurring accounting entries"/>
+                <label string="Create manual recurring entries in a chosen journal."/>
+                <group>
+                    <field name="model"/>
+                </group>
             </form>
             </field>
         </record>
@@ -37,11 +38,12 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Use Model">
-                    <label string = "Are you sure you want to create entries?" colspan="2"/>
-                    <newline/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                <form string="Use Model" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <label string = "Are you sure you want to create entries?"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 31984596000..a9c9b60fbb0 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,17 +8,17 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries">
-                <separator string="Post Journal Entries of a Journal" colspan="4"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore." colspan="4"/>
-                <field name="journal_id"/>
-                <newline/>
-                <field name="period_id"/>
-                <separator colspan="4"/>
-                <group colspan="4" col="6">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+            <form string="Post Journal Entries" version="7.0">
+                <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-               </group>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <header>
+                <separator string="Post Journal Entries of a Journal"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+                <group>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                </group>
                </form>
             </field>
         </record>
@@ -46,15 +46,13 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries">
-                <separator string="Post Journal Entries" colspan="4"/>
-                <image name="terp-referer"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
-                <separator colspan="4"/>
-                <group colspan="4" col="6">
+            <form string="Post Journal Entries" version="7.0">
+                <header>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
-               </group>
+                <header>
+                <separator string="Post Journal Entries"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index d8e7560e029..a54da1aaad6 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -7,20 +7,22 @@
             <field name="model">account.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Taxes Report">
-                <separator string="Taxes Report" colspan="4"/>
-                <label colspan="4" nolabel="1" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
-                <newline/>
-                <field name="chart_tax_id" widget='selection'/>
-                <field name="fiscalyear_id"/>
-                <field name="display_detail"/>
-                <!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
-                <separator string="Periods"  colspan="4"/>
-                <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                <group col="2" colspan="4">
+            <form string="Taxes Report" version="7.0">
+                <header>
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/>
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
-                    <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
+                </header>
+                <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <group string="Taxes Report" col="4">
+                    <field name="chart_tax_id" widget='selection'/>
+                    <field name="fiscalyear_id"/>
+                    <field name="display_detail"/>
+                    <!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
+                </group>
+
+                <group string="Periods"  col="4">
+                    <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
+                    <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
             </form>
             </field>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 88772aede84..8c560f45e5d 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -24,7 +24,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Defaults">
+                <form string="Analytic Defaults" version="7.0">
                     <group col="4">
                         <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                         <field name="sequence"/>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index f2ba4c40d67..265f71d690f 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -111,7 +111,7 @@
         <field name="model">account.analytic.plan.instance</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Distribution">
+            <form string="Analytic Distribution" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="code"/>
@@ -123,7 +123,7 @@
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </tree>
-                    <form string="Analytic Distribution">
+                    <form string="Analytic Distribution" version="7.0">
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </form>
@@ -138,8 +138,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
                 <field name="plan_id"/>
                 <field name="journal_id"/>
             </tree>
@@ -167,7 +167,7 @@
         <field name="model">account.analytic.plan.instance.line</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Distribution Line">
+            <form string="Analytic Distribution Line" version="7.0">
                 <group col="4">
                     <field name="plan_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
@@ -183,8 +183,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
-                <field name="plan_id" select="1"/>
-                <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                <field name="plan_id"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </tree>
         </field>
@@ -206,7 +206,7 @@
         <field name="model">account.analytic.plan</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Plan">
+            <form string="Analytic Plan" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="default_instance_id"/>
@@ -252,7 +252,7 @@
         <field name="model">account.analytic.plan.line</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Plan Line">
+            <form string="Analytic Plan Line" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="sequence"/>
@@ -271,7 +271,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Plan Lines">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="sequence"/>
                 <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <field name="min_required"/>
@@ -289,7 +289,7 @@
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
             <field name="arch" type="xml">
                 <field name="analytic_id" required="1" position="replace">
-                    <field name="analytics_id" select="1" required="1"/>
+                    <field name="analytics_id" required="1"/>
                 </field>
             </field>
         </record>
@@ -300,7 +300,7 @@
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
                 <field name="analytic_id" required="1" position="replace">
-                    <field name="analytics_id" select="1" required="1"/>
+                    <field name="analytics_id" required="1"/>
                 </field>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 60c1bf67463..d68b6057290 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -2,26 +2,25 @@
 <openerp>
     <data>
 
-		<record id="view_account_crossovered_analytic" model="ir.ui.view">
+        <record id="view_account_crossovered_analytic" model="ir.ui.view">
             <field name="name">account.crossovered.analytic.form</field>
             <field name="model">account.crossovered.analytic</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Crossovered Analytic">
-			    <group col="4" colspan="6">
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <field name="ref" groups="analytic.group_analytic_accounting"/>
-				    <field name="empty_line"/>
-				    <separator colspan="4" string="Analytic Journal"/>
-				    <field name="journal_ids" colspan="4" nolabel="1"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-				</group>
-			</form>
+            <form string="Crossovered Analytic" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <header>
+                <group col="4">
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <field name="ref" groups="analytic.group_analytic_accounting"/>
+                    <field name="empty_line"/>
+                </group><group string="Analytic Journal"/>
+                    <field name="journal_ids" colspan="2" nolabel="1"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -34,7 +33,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="account_crossovered_analytic_values">
+        <record model="ir.values" id="account_crossovered_analytic_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
             <field name="name">Crossovered Analytic</field>
             <field name="key2">client_print_multi</field>
@@ -43,5 +42,5 @@
             <field name="model">account.analytic.account</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index 75ef07e0098..d07cd317def 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -1,40 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
+        <record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.msg.form</field>
             <field name="model">analytic.plan.create.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Distribution Model Saved">
-			    <group col="4" colspan="6">
-			    	<label string="Save This Distribution as a Model"/>
-				    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-			    	<button special="cancel" string="Cancel" icon='gtk-ok' />
-            		<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
-				</group>
-			</form>
+            <form string="Distribution Model Saved" version="7.0">
+                <header>
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
+                    <button special="cancel" string="Cancel" icon='gtk-ok' />
+                <header>
+                <label string="Save This Distribution as a Model"/>
+            </form>
             </field>
         </record>
 
-		<record id="view_analytic_plan_create_model" model="ir.ui.view">
+        <record id="view_analytic_plan_create_model" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.form</field>
             <field name="model">analytic.plan.create.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Distribution Model Saved">
-			    <group col="4" colspan="6">
-			    	<label string="This distribution model has been saved.You will be able to reuse it later."/>
-				    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel" string="Ok" icon='gtk-ok'/>
-				</group>
-			</form>
+            <form string="Distribution Model Saved" version="7.0">
+                <header>
+                    <button special="cancel" string="Ok" icon='gtk-ok'/>
+                <header>
+                <label string="This distribution model has been saved.You will be able to reuse it later."/>
+            </form>
             </field>
         </record>
 
@@ -49,5 +41,5 @@
             <field name="view_id" ref="view_analytic_plan_create_model_msg"/>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 90dc9d61d3a..01144c153e5 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -10,7 +10,7 @@
         <field name="model">account.asset.category</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset category">
+            <form string="Asset category" version="7.0">
                 <group>
                     <group>
                         <field name="name"/>
@@ -79,7 +79,7 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset">
+            <form string="Asset" version="7.0">
                 <header>
                     <button name="validate" states="draft" string="Confirm Asset" type="object"/>
                     <button name="set_to_close" states="open" string="Set to Close" type="object"/>
@@ -225,7 +225,7 @@
         <field name="model">account.asset.history</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset History">
+            <form string="Asset History" version="7.0">
                 <group>
                     <group>
                         <field name="name"/>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index e48703e4125..a68d28ac653 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -7,7 +7,7 @@
             <field name="model">asset.modify</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Modify Asset">
+                <form string="Modify Asset" version="7.0">
                     <header>
                         <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 00636491ac4..7c59dc1c0d0 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -6,19 +6,18 @@
             <field name="model">asset.depreciation.confirmation.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                    <form string="Compute Asset">
-                        <separator string="Post Depreciation Lines" colspan="4"/>
-                        <label string="This wizard will post the depreciation lines of running assets that belong to the selected period." colspan="4"/>
-                        <newline/>
+                <form string="Compute Asset" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <header>
+                    <separator string="Post Depreciation Lines"/>
+                    <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
+                    <group>
                         <field name="period_id"/>
-                        <separator colspan="4"/>
-                        <group colspan="4" col="6">
-                           <label string="" colspan="2"/>
-                           <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                           <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        </group>
-                     </form>
-                   </field>
+                    </group>
+                </form>
+             </field>
         </record>
 
         <record id="action_asset_depreciation_confirmation_wizard" model="ir.actions.act_window">
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 bbd8cabeda4..d806760a85b 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -9,7 +9,7 @@
       <field name="model">account.bank.statement.line.global</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Batch Payment Info">
+        <form string="Batch Payment Info" version="7.0">
             <group col="4">
                 <field name="name"/>
                 <field name="amount"/>
@@ -94,7 +94,7 @@
       <field name="model">account.bank.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Statement Line">
+        <form string="Statement Line" version="7.0">
           <group col="4">
               <field name="statement_id"/>
               <field name="journal_id"/>
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
index 23a28440d54..90cdaeb30b0 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
@@ -9,16 +9,11 @@
       <field name="model">cancel.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Cancel selected statement lines">
-          <label string="" colspan="4"/>
-          <label colspan="4" string="Are you sure you want to cancel the selected Bank Statement lines ?"/>
-          <label string="" colspan="4"/>
-          <separator colspan="4"/>
-          <group>
-            <label string="" colspan="2"/>
-            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-            <button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
-          </group>
+        <form string="Cancel selected statement lines" version="7.0">
+            <header>
+                <button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
+            <header>
+            <label string="Are you sure you want to cancel the selected Bank Statement lines ?"/>
         </form>
       </field>
     </record>
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index c44e58e340d..a0862537e2a 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -9,17 +9,13 @@
       <field name="model">confirm.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Confirm selected statement lines">
-          <label string="" colspan="4"/>
-          <label colspan="4" string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
-          <label colspan="4" string="Confirmed lines cannot be changed anymore."/>
-          <label string="" colspan="4"/>
-          <separator colspan="4"/>
-          <group>
-            <label string="" colspan="2"/>
-            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-            <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
-          </group>
+        <form string="Confirm selected statement lines" version="7.0">
+            <header>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
+            <header>
+            <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
+            <label string="Confirmed lines cannot be changed anymore."/>
         </form>
       </field>
     </record>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 1c975cef727..1dd4e3a7dc0 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -55,7 +55,7 @@
             <field name="model">account.budget.post</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budgetary Position">
+                <form string="Budgetary Position" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -79,11 +79,11 @@
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
-                                    <field name="practical_amount" select="1" sum="Practical Amount" />
+                                    <field name="practical_amount" sum="Practical Amount" />
                                     <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
                                         <field name="crossovered_budget_id"/>
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
@@ -91,7 +91,7 @@
                                         <field name="date_to"/>
                                         <field name="paid_date"/>
                                         <field name="planned_amount"/>
-                                        <field name="practical_amount" select="1"/>
+                                        <field name="practical_amount"/>
                                         <field name="theoritical_amount"/>
                                         <field name="percentage"/>
                                     </group>
@@ -108,19 +108,19 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <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" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </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="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -138,14 +138,14 @@
                                     <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
-                                        <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                                        <field name="general_budget_id" select="1"/>
+                                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="general_budget_id"/>
                                         <field name="date_from"/>
                                         <field name="date_to"/>
-                                        <field name="paid_date" select="1"/>
-                                        <field name="planned_amount" select="1"/>
+                                        <field name="paid_date"/>
+                                        <field name="planned_amount"/>
                                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                     </group>
                                 </form>
@@ -230,7 +230,7 @@
             <field name="model">crossovered.budget.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budget Lines">
+                <form string="Budget Lines" version="7.0">
                     <group col="4">
                         <field name="crossovered_budget_id"/>
                         <field name="analytic_account_id"/>
@@ -288,7 +288,7 @@
                                     <field name="theoritical_amount" sum="Theoritical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
                                         <field name="crossovered_budget_id"/>
                                         <field name="general_budget_id"/>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 4081026b911..dc5a0613ff9 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -7,37 +7,37 @@
              <field name="model">account.budget.analytic</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                    <separator string="This wizard is used to print budget" colspan="4"/>
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <separator colspan="4"/>
-				    <group colspan="4" col="6">
-	 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	           			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     <header>
+                     <group string="This wizard is used to print budget" col="4">
+                         <field name="date_from"/>
+                         <field name="date_to"/>
+                     </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_analytic" model="ir.actions.act_window">
-			<field name="name">Print Budgets</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.analytic</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_analytic_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_budget_analytic" model="ir.actions.act_window">
+            <field name="name">Print Budgets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.analytic</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_analytic_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_budget_analytic_values">
-			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="name">Print Budgets</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
-			<field name="key">action</field>
-			<field name="model">account.analytic.account</field>
-		</record>
+        <record model="ir.values" id="account_budget_analytic_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Print Budgets</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 35cf353ccde..b53e74a2cb2 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -7,35 +7,35 @@
              <field name="model">account.budget.crossvered.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                	<separator string="This wizard is used to print budget" colspan="4"/>
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <separator colspan="4"/>
-				    <group colspan="4" col="6">
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     <header>
+                    <group string="This wizard is used to print budget" col="4">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_crossvered_report" model="ir.actions.act_window">
-			<field name="name">Print Budgets</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.crossvered.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_crossvered_report_view"/>
-			<field name="target">new</field>
-		</record>
-		<record model="ir.values" id="account_budget_crossvered_report_values">
-			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="name">Print Budgets</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
-			<field name="key">action</field>
-			<field name="model">crossovered.budget</field>
-		</record>
-	</data>
+        <record id="action_account_budget_crossvered_report" model="ir.actions.act_window">
+            <field name="name">Print Budgets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.crossvered.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_crossvered_report_view"/>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.values" id="account_budget_crossvered_report_values">
+            <field name="model_id" ref="account_budget.model_crossovered_budget" />
+            <field name="name">Print Budgets</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
+            <field name="key">action</field>
+            <field name="model">crossovered.budget</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 70f5eef38f7..7dd01f64144 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -7,36 +7,36 @@
              <field name="model">account.budget.crossvered.summary.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-					<separator string="This wizard is used to print summary of budgets" colspan="4"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     <header>
+                    <group string="This wizard is used to print summary of budgets">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
-			<field name="name">Print Summary</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.crossvered.summary.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
+            <field name="name">Print Summary</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.crossvered.summary.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_budget_crossvered_summary_report_values">
-			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="name">Print Summary</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
-			<field name="key">action</field>
-			<field name="model">crossovered.budget</field>
-		</record>
-	</data>
+        <record model="ir.values" id="account_budget_crossvered_summary_report_values">
+            <field name="model_id" ref="account_budget.model_crossovered_budget" />
+            <field name="name">Print Summary</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
+            <field name="key">action</field>
+            <field name="model">crossovered.budget</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index bfa61240b3b..d0abab9ffc8 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -7,15 +7,15 @@
         <field name="model">account.budget.report</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-          <form string="Select Dates Period">
-			<separator string="Print Budgets" colspan="4"/>
-			<field name="date_from"/>
-			<field name="date_to"/>
-			<separator colspan="4"/>
-            <group colspan="4" col="6">
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+          <form string="Select Dates Period" version="7.0">
+              <header>
                   <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-            </group>
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              <header>
+              <group string="Print Budgets" col="4">
+                  <field name="date_from"/>
+                  <field name="date_to"/>
+              </group>
           </form>
         </field>
       </record>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index df05bb8708e..7be5c4b8024 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -35,11 +35,11 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Bank Account Configuration">
-          <field name="name" select="1"/>
+          <field name="name"/>
           <field name="bank_id"/>
           <field name="currency"/>
           <field name="description1"/>
-          <field name="journal" select="1"/>
+          <field name="journal"/>
           <field name="state"/>
         </tree>
       </field>
@@ -49,9 +49,9 @@
       <field name="model">coda.bank.account</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Bank Account Configuration">
+        <form string="CODA Bank Account Configuration" version="7.0">
             <group col="4">
-                <field name="name" select="1" colspan="4"/>
+                <field name="name" colspan="4"/>
                 <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 <field name="description1"/>
                 <field name="currency"/>
@@ -99,7 +99,7 @@
       <field name="model">account.coda.trans.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Type">
+          <form string="CODA Transaction Type" version="7.0">
               <group col="4">
                   <field name="type"/>
                   <field name="parent_id"/>
@@ -136,7 +136,7 @@
       <field name="model">account.coda.trans.code</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Code">
+          <form string="CODA Transaction Code" version="7.0">
               <group col="4">
                   <field name="code"/>
                   <field name="type"/>
@@ -173,7 +173,7 @@
       <field name="model">account.coda.trans.category</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Category">
+          <form string="CODA Transaction Category" version="7.0">
               <field name="category"/>
               <field name="description"/>
           </form>
@@ -205,7 +205,7 @@
       <field name="model">account.coda.comm.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Structured Communication Type">
+          <form string="CODA Structured Communication Type" version="7.0">
               <field name="code"/>
               <field name="description"/>
           </form>
@@ -245,7 +245,7 @@
       <field name="model">account.coda</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA File">
+          <form string="CODA File" version="7.0">
               <group col="4">
                   <field name="coda_creation_date"/>
                   <field name="name"/>
@@ -321,7 +321,7 @@
       <field name="model">coda.bank.statement</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Bank Statement">
+          <form string="CODA Bank Statement" version="7.0">
               <group col="4">
                   <field name="name"/>
                   <field name="date"/>
@@ -349,7 +349,7 @@
                       <field name="globalisation_amount" string="Glob. Amount"/>
                       <field name="globalisation_id" string="Glob. Id"/>
                     </tree>
-                    <form string="CODA Statement Lines">
+                    <form string="CODA Statement Lines" version="7.0">
                       <group col="4">
                           <field name="sequence" string="Seq"/>
                           <field name="date"/>
@@ -445,7 +445,7 @@
       <field name="model">coda.bank.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Statement Line">
+        <form string="CODA Statement Line" version="7.0">
             <group col="4">
                 <field name="statement_id"/>
                 <field name="coda_bank_account_id"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index ed30a033040..90e905989d6 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -8,17 +8,15 @@
       <field name="type">form</field>
       <field name="priority">1</field>
       <field name="arch" type="xml">
-        <form string="Import CODA File">
-          <group col="2">
-            <separator string="Select Your File :" colspan="4"/>
-            <field name="coda_data" filename="coda_fname"/>
-            <field name="coda_fname"/>
-          </group>
-          <separator colspan="4"/>
-          <group colspan="4">
-            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-            <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
-          </group>
+        <form string="Import CODA File" version="7.0">
+            <header>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
+                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+            <header>
+            <group col="2" string="Select Your File :">
+                <field name="coda_data" filename="coda_fname"/>
+                <field name="coda_fname"/>
+            </group>
         </form>
       </field>
     </record>
@@ -29,14 +27,15 @@
       <field name="type">form</field>
       <field name="priority">2</field>
       <field name="arch" type="xml">
-        <form string="Import CODA File">
-          <separator colspan="4" string="Results :" />
-          <field name="note" colspan="4" nolabel="1" width="850" height="400"/>
-          <newline/>
-          <separator colspan="6"/>
-          <button special="cancel" string="Close" icon="gtk-cancel"/>
-          <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
-          <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
+        <form string="Import CODA File" version="7.0">
+          <header>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
+              <button special="cancel" string="Close" icon="gtk-cancel"/>
+          </header>
+          <group string="Results :">
+              <field name="note" nolabel="1" colspan="2"/>
+          </group>
         </form>
       </field>
     </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 74de731aa2f..89423327d68 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Steps">
+                <form string="Follow-Up Steps" version="7.0">
                     <group col="4">
                        <field name="name"/>
                        <field name="delay"/>
@@ -43,7 +43,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up">
+                <form string="Follow-Up" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>