From ee05d6050ea464b44bdd50489aac33a152530e32 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Jun 2012 14:03:34 +0200
Subject: [PATCH] [IMP] XML design

bzr revid: fp@tinyerp.com-20120605120334-3vbk4cu2xf8vmbrf
---
 addons/account/account_view.xml | 981 +++++++++++++++-----------------
 addons/crm/crm_lead_view.xml    |   2 +-
 2 files changed, 452 insertions(+), 531 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6eec7156d25..9bf0021e03e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -11,29 +11,34 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <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" />
                 </header>
                 <sheet string="Fiscalyear" layout="auto">
-                    <group class="oe_form_header">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="end_journal_period_id"/>
-                    </group>
-                    <separator colspan="4" string="Periods"/>
-                    <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period">
+                    <group>
+                        <group>
                             <field name="name"/>
                             <field name="code"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="end_journal_period_id"/>
+                        </group>
+                        <group>
                             <field name="date_start"/>
                             <field name="date_stop"/>
-                            <field name="special"/>
+                        </group>
+                    </group>
+                    <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
+                        <form string="Period">
+                            <group col="4">
+                                <field name="name"/>
+                                <field name="code"/>
+                                <field name="date_start"/>
+                                <field name="date_stop"/>
+                                <field name="special"/>
+                            </group>
                         </form>
                     </field>
                 </sheet>
@@ -93,22 +98,22 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <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"/>
                 </header>
-                <sheet string="Period" layout="auto">
-                <group class="oe_form_header">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="fiscalyear_id" widget="selection"/>
-                    <field name="special"/>
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="fiscalyear_id" widget="selection"/>
+                        <field name="special"/>
                     </group>
-                    </sheet>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -165,41 +170,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                    <label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
+                    <h1>
+                        <field name="name"/> - 
+                        <field name="code"/>
+                    </h1>
+                    <label for="company_id"/>
+                    <h2>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
-                        <field name="parent_id"/>
-                        <field name="type" select="1"/>
-                        <field name="user_type" select="1"/>
-                        <field name="active"/>
-                        <newline/>
-                        <field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
-                        <field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
-                        <field name="balance" invisible="context.get('config_invisible', True)"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="parent_id"/>
+                            <field name="type"/>
+                            <field name="user_type"/>
+                            <field name="active"/>
+                        </group>
+                        <group>
+                            <field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
+                            <field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
+                            <field name="balance" invisible="context.get('config_invisible', True)"/>
+                        </group>
+                        <group>
+                            <field name="tax_ids" domain="[('parent_id','=',False)]" widget="many2many_tags"/>
+                            <field name="child_consol_ids"
+                                attrs="{'readonly':[('type','!=','consolidation')]}"
+                                widget="many2many_tags/>
+                        </group>
+                        <group string="Currency">
+                            <field name="currency_id"/>
+                            <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
+                        </group>
+                        <group string="Reconcile">
+                            <field name="reconcile"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
-                            <newline/>
-                            <group col="2" colspan="2">
-                                <separator string="Currency" colspan="2"/>
-                                <field name="currency_id"/>
-                                <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Reconcile" colspan="2"/>
-                                <field name="reconcile"/>
-                            </group>
-                            <separator string="Default Taxes" colspan="4"/>
-                            <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
-                            <separator string="Consolidated Children" colspan="4"/>
-                            <field name="child_consol_ids" colspan="4" nolabel="1" attrs="{'readonly':[('type','!=','consolidation')]}"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -349,8 +355,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Column">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="field" select="1"/>
+                    <field name="name"/>
+                    <field name="field"/>
                     <field name="sequence"/>
                 </form>
             </field>
@@ -394,7 +400,7 @@
             <field name="arch" type="xml">
                 <form string="Journal View">
                     <field name="name"/>
-                    <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
+                    <field name="columns_id"/>
                 </form>
             </field>
         </record>
@@ -452,66 +458,53 @@
                 </search>
             </field>
         </record>
+
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="type" on_change="onchange_type(type, currency, context)"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
-                            <group col="2" colspan="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Accounts" colspan="4"/>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                </group>
-                                <group colspan="2" col="2">
-                                    <separator string="Journal View" colspan="4"/>
-                                    <field name="view_id" widget="selection"/>
-                                </group>
-                            </group>
-
-                            <group colspan="2" col="2">
-                                <separator string="Company" colspan="4"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="user_id"/>
+                    <div class="oe_form_title">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
+                        <label for="type" class="oe_form_readonly_hidden"/>
+                        <h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2>
+                    </div>
+                    <notebook>
+                    <page string="Journal Configuration">
+                        <group>
+                            <group>
+                                <field name="code"/>
                                 <field name="currency"/>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Validations" colspan="4"/>
-                                <field name="allow_date"/>
+                            <group>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="user_id"/>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Other Configuration" colspan="4"/>
+                            <group>
+                                <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="view_id" widget="selection"/>
+                                    <field name="sequence_id" required="0"/>
+                            </group>
+                            <group>
                                 <field name="centralisation"/>
                                 <field name="entry_posted"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Invoicing Data" colspan="4"/>
-<!--                                <field name="invoice_sequence_id"/>-->
+                                <field name="allow_date"/>
                                 <field name="group_invoice_lines"/>
                             </group>
-                            <group colspan="2" col="2"> <!-- can't set the field as hidden for certain groups as it's required in the object and not in the view, and GTK doesn't handle that correctly -->
-                                <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id" required="0"/>
+                            <group>
+                                <field name="type_control_ids" widget="many2many_tags"/>
+                                <field name="account_control_ids" widget="many2many_tags"/>
                             </group>
-                        </page>
-                        <page string="Entry Controls">
-                            <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
-                            <field colspan="4" name="type_control_ids" nolabel="1"/>
-                            <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
-                            <field colspan="4" name="account_control_ids" nolabel="1"/>
-                        </page>
+                        </group>
+                    </page>
                     </notebook>
                 </form>
             </field>
         </record>
+
         <record id="action_account_journal_form" model="ir.actions.act_window">
             <field name="name">Journals</field>
             <field name="res_model">account.journal</field>
@@ -594,28 +587,31 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Bank Statement">
                 <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Bank Statement" layout="auto">
-                    <group col="7" colspan="4" class="oe_form_header">
-                        <field name="name" select="1"/>
-                        <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"/>
-                        <newline/>
-                        <field name="period_id"/>
-                        <field name="balance_start"/>
-                        <field name="balance_end_real"/>
-                        <field name="currency" invisible="1"/>
-                        <field name='company_id' widget="selection" groups="base.group_multi_company" />
+                <sheet>
+                    <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="period_id"/>
+                            <field name='company_id' widget="selection" groups="base.group_multi_company" />
+                        </group><group>
+                            <field name="balance_start"/>
+                            <field name="balance_end_real"/>
+                            <field name="currency" invisible="1"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Transaction" name="statement_line_ids">
-                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
+
+                    <notebook>
+                        <page string="Transactions" name="statement_line_ids">
+                            <field name="line_ids" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" readonly="1" invisible="1"/>
                                     <field name="date"/>
@@ -628,22 +624,24 @@
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines">
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
-                                    <field name="amount"/>
-                                    <field name="sequence" readonly="0"/>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="note" nolabel="1"/>
+                                    <group col="4">
+                                        <field name="date"/>
+                                        <field name="name"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+                                        <field name="amount"/>
+                                        <field name="sequence" readonly="0"/>
+                                    </group>
+                                    <separator string="Notes"/>
+                                    <field name="note"/>
                                 </form>
                             </field>
                         </page>
                         <page string="Journal Entries" name="move_live_ids">
-                            <field colspan="4" name="move_line_ids" nolabel="1"/>
+                            <field name="move_line_ids"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -651,55 +649,6 @@
             </field>
         </record>
 
-        <record id="view_bank_statement_periodic_form" model="ir.ui.view">
-            <field name="name">account.bank.statement.reconcile.form</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form layout="manual">
-                <header>
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
-                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                </header>
-                <sheet string="Bank Statement" layout="auto">
-                    <group col="7" colspan="4" class="oe_form_header">
-                        <field name="name" select="1"/>
-                        <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
-                        <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <newline/>
-                        <field name="period_id"/>
-                        <field name="balance_start"/>
-                        <field name="balance_end_real"/>
-                        <field name="currency" invisible="1"/>
-                        <field name="account_id" invisible="1"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Journal Entries">
-                            <field colspan="4" name="move_line_ids" nolabel="1" widget="many2many" domain="[('account_id','=',account_id),('statement_id', '=', False)]">
-                                <tree string="Statement lines">
-                                    <field name="date"/>
-                                    <field name="period_id"/>
-                                    <field name="journal_id"/>
-                                    <field name="ref"/>
-                                    <field name="name"/>
-                                    <field name="account_id"/>
-                                    <field name="partner_id"/>
-                                    <field name="debit"/>
-                                    <field name="credit"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <group col="8" colspan="4">
-                        <field name="balance_end"/>
-                    </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
 
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
@@ -724,31 +673,7 @@
             <field name="act_window_id" ref="action_bank_statement_tree"/>
         </record>
 
-    <record id="action_bank_statement_periodic_tree" model="ir.actions.act_window">
-            <field name="name">Bank Statements</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
-            <field name="search_view_id" ref="view_bank_statement_search"/>
-            <field name="context">{'journal_type':'bank'}</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_bank_statement_periodic_tree_bank">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
-            <field name="act_window_id" ref="action_bank_statement_periodic_tree"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_bank_statement_periodic_form_bank">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_bank_statement_periodic_form"/>
-            <field name="act_window_id" ref="action_bank_statement_periodic_tree"/>
-        </record>
-
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
-        <menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.periodical_processing_reconciliation" sequence="15"/>
-
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft statements</field>
@@ -792,20 +717,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Type">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="report_type"/>
+                            <field name="close_method"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator string="Reporting Configuration" colspan="4"/>
-                        <field name="report_type" select="2"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Closing Method" colspan="4"/>
-                        <field name="close_method"/>
-                    </group>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="Description"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -849,15 +772,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Reconcile">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="create_date" select="1"/>
-                        <field name="type" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="create_date"/>
+                        <field name="type"/>
                     </group>
-                    <separator colspan="4" string="Reconcile Entries"/>
-                    <field colspan="4" name="line_id" nolabel="1"/>
-                    <separator colspan="4" string="Partial Reconcile Entries"/>
-                    <field colspan="4" name="line_partial_ids" nolabel="1"/>
+                    <separator string="Reconcile Entries"/>
+                    <field name="line_id"/>
+                    <separator string="Partial Reconcile Entries"/>
+                    <field name="line_partial_ids"/>
                 </form>
             </field>
         </record>
@@ -900,24 +823,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Code">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="parent_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group col="4" colspan="2">
+                            <field name="name"/>
+                            <field name="code"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group string="Reporting Configuration">
+                            <field name="notprintable"/>
+                            <field name="sign"/>
+                        </group>
+                        <group string="Statistics">
+                            <field name="sum_period"/>
+                            <field name="sum"/>
+                        </group>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Reporting Configuration" colspan="4"/>
-                        <field name="notprintable"/>
-                        <field name="sign"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Statistics" colspan="4"/>
-                        <field name="sum_period"/>
-                        <field name="sum"/>
-                    </group>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="info" nolabel="1"/>
+                    <separator string="Description"/>
+                    <field name="info"/>
                 </form>
             </field>
         </record>
@@ -971,7 +894,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax">
-                    <group colspan="4" col="6">
+                    <group col="4">
                         <field name="name"/>
                         <field name="description"/>
                         <field name="type_tax_use"/>
@@ -979,9 +902,9 @@
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Tax Definition" >
-                          <group colspan="4" col="4">
+                    <notebook>
+                        <page string="Tax Definition">
+                            <group col="4">
                                   <field name="type"/>
                                   <field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
                                   <separator colspan="4" string="Accounting Information"/>
@@ -1011,19 +934,20 @@
                                           <field name="description"/>
                                      </tree>
                                  </field>
-                          </group>
+                            </group>
                         </page>
                         <page string="Special Computation">
-                            <separator colspan="4" string="Applicability Options"/>
-                            <field name="applicable_type"/>
-                            <field name="domain"/>
-                            <separator colspan="4" string="Applicable Code (if type=code)"/>
-                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
-                            <separator colspan="2" string="Compute Code"/>
-                            <separator colspan="2" string="Reverse Compute Code"/>
-                            <field colspan="2" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
-                            <field colspan="2" name="python_compute_inv" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
-
+                            <group col="4">
+                                <separator colspan="4" string="Applicability Options"/>
+                                <field name="applicable_type"/>
+                                <field name="domain"/>
+                                <separator colspan="4" string="Applicable Code (if type=code)"/>
+                                <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
+                                <separator colspan="2" string="Compute Code"/>
+                                <separator colspan="2" string="Reverse Compute Code"/>
+                                <field colspan="2" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
+                                <field colspan="2" name="python_compute_inv" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
+                            </group>
                         </page>
                     </notebook>
                 </form>
@@ -1087,7 +1011,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item">
-                    <group col="6" colspan="4">
+                    <group col="6">
                         <field name="name" select="1"/>
                         <field name="ref"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
@@ -1098,62 +1022,56 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Amount"/>
-                                <field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                                <field name="debit"/>
-                                <field name="credit"/>
-                                <field name="quantity"/>
-                            </group>
+                            <group>
+                                <group string="Amount">
+                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="quantity"/>
+                                </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Accounting Documents"/>
-                                <field name="invoice" readonly="True"/>
-                                <field name="move_id" required="False"/>
-                                <field name="statement_id" readonly="True"/>
-                            </group>
+                                <group string="Accounting Documents">
+                                    <field name="invoice" readonly="True"/>
+                                    <field name="move_id" required="False"/>
+                                    <field name="statement_id" readonly="True"/>
+                                </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Dates"/>
-                                <field name="date" select="1"/>
-                                <field name="date_maturity"/>
-                                <field name="date_created" readonly="True"/>
-                            </group>
+                                <group string="Dates">
+                                    <field name="date"/>
+                                    <field name="date_maturity"/>
+                                    <field name="date_created" readonly="True"/>
+                                </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Taxes"/>
-                                <field name="tax_code_id"/>
-                                <field name="tax_amount"/>
-                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                            </group>
+                                <group string="Taxes">
+                                    <field name="tax_code_id"/>
+                                    <field name="tax_amount"/>
+                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                </group>
 
-                            <group col="2" colspan="2" attrs="{'readonly':[('state','=','valid')]}" >
-                                <separator colspan="2" string="Currency"/>
-                                <field name="currency_id"/>
-                                <field name="amount_currency"/>
-                            </group>
+                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+                                    <field name="currency_id"/>
+                                    <field name="amount_currency"/>
+                                </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Reconciliation"/>
-                                <field name="reconcile_id"/>
-                                <field name="reconcile_partial_id"/>
-                            </group>
+                                <group string="Reconciliation">
+                                    <field name="reconcile_id"/>
+                                    <field name="reconcile_partial_id"/>
+                                </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="States"/>
-                                <field name="state"/>
-                                <field name="blocked"/>
-                            </group>
+                                <group string="States">
+                                    <field name="state"/>
+                                    <field name="blocked"/>
+                                </group>
 
-                            <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-                                <separator colspan="2" string="Analytic"/>
-                                <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                </group>
                             </group>
                             <separator string="Internal Note" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                         </page>
                     </notebook>
                 </form>
@@ -1169,38 +1087,40 @@
                 <form string="Journal Item">
                     <notebook colspan="4">
                         <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="date"/>
-                            <field name="journal_id" readonly="False" select="1"/>
-                            <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="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-                            <newline/>
-                            <field name="debit"/>
-                            <field name="credit"/>
+                            <group col="4">
+                                <separator colspan="4" string="General Information"/>
+                                <field name="name" select="1"/>
+                                <field name="date"/>
+                                <field name="journal_id" readonly="False" select="1"/>
+                                <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="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                <newline/>
+                                <field name="debit"/>
+                                <field name="credit"/>
 
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity" select="3"/>
-                            <field name="move_id" required="False"/>
-                            <newline/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-                            <field name="date_created"/>
-                            <field name="blocked" select="3"/>
-                            <newline/>
-                            <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                            <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                            <separator colspan="4" string="Status"/>
-                            <newline/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="state"/>
+                                <separator colspan="4" string="Optional Information"/>
+                                <field name="currency_id"/>
+                                <field name="amount_currency"/>
+                                <field name="quantity" select="3"/>
+                                <field name="move_id" required="False"/>
+                                <newline/>
+                                <field name="date_maturity"/>
+                                <field name="date_created"/>
+                                <field name="date_created"/>
+                                <field name="blocked" select="3"/>
+                                <newline/>
+                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+                                <separator colspan="4" string="Status"/>
+                                <newline/>
+                                <field name="reconcile_id"/>
+                                <field name="reconcile_partial_id"/>
+                                <field name="state"/>
+                            </group>
                         </page>
                         <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                            <field colspan="4" name="analytic_lines" nolabel="1" />
+                            <field name="analytic_lines"/>
                         </page>
                     </notebook>
                 </form>
@@ -1348,19 +1268,19 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
-                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                    <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
+                    <group col="4">
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
-                        <field name="to_check"/>
                         <field name="journal_id"/>
                         <field name="period_id"/>
+                        <field name="to_check"/>
                         <field name="date"/>
                         <field name="company_id" required="1" groups="base.group_multi_company"/>
                         <field name="partner_id" invisible="1"/>
@@ -1369,9 +1289,9 @@
                     <notebook colspan="4">
                         <page string="Journal Items">
                             <field name="balance" invisible="1"/>
-                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" 
-                            on_change="onchange_line_id(line_id)"
-                            context="{'balance': balance , 'journal': journal_id }">
+                            <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">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
@@ -1384,59 +1304,53 @@
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Information">
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                                <field name="debit"/>
-                                                <field name="credit"/>
-                                                <field name="quantity"/>
-                                            </group>
+                                            <group>
+                                                <group string="Amount">
+                                                    <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                    <field name="debit"/>
+                                                    <field name="credit"/>
+                                                    <field name="quantity"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Accounting Documents"/>
-                                                <field name="invoice"/>
-                                                <field name="move_id" required="False"/>
-                                                <field name="statement_id"/>
-                                            </group>
+                                                <group string="Accounting Documents">
+                                                    <field name="invoice"/>
+                                                    <field name="move_id" required="False"/>
+                                                    <field name="statement_id"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Dates"/>
-                                                <field name="date"/>
-                                                <field name="date_maturity"/>
-                                                <field name="date_created"/>
-                                            </group>
+                                                <group string="Dates">
+                                                    <field name="date"/>
+                                                    <field name="date_maturity"/>
+                                                    <field name="date_created"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Taxes"/>
-                                                <field name="tax_code_id"/>
-                                                <field name="tax_amount"/>
-                                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                                            </group>
+                                                <group string="Taxes">
+                                                    <field name="tax_code_id"/>
+                                                    <field name="tax_amount"/>
+                                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Currency"/>
-                                                <field name="currency_id"/>
-                                                <field name="amount_currency"/>
-                                            </group>
+                                                <group string="Currency">
+                                                    <field name="currency_id"/>
+                                                    <field name="amount_currency"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="Reconciliation"/>
-                                                <field name="reconcile_id"/>
-                                                <field name="reconcile_partial_id"/>
-                                            </group>
+                                                <group string="Reconciliation">
+                                                    <field name="reconcile_id"/>
+                                                    <field name="reconcile_partial_id"/>
+                                                </group>
 
-                                            <group col="2" colspan="2">
-                                                <separator colspan="2" string="States"/>
-                                                <field name="state"/>
-                                                <field name="blocked"/>
-                                            </group>
+                                                <group string="States">
+                                                    <field name="state"/>
+                                                    <field name="blocked"/>
+                                                </group>
 
-                                            <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-                                                <separator colspan="2" string="Analytic"/>
-                                                <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                                <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                                </group>
                                             </group>
-                                            <separator string="Internal Note" colspan="4"/>
-                                            <field name="narration" colspan="4" nolabel="1"/>
+                                            <separator string="Internal Note"/>
+                                            <field name="narration"/>
                                         </page>
                                         <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -1462,7 +1376,7 @@
                                     <field name="reconcile_partial_id"/>
                                 </tree>
                             </field>
-                            <separator colspan="4" string="Internal Note"/>
+                            <separator string="Internal Note"/>
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
                         </page>
                     </notebook>
@@ -1654,15 +1568,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model Line">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="sequence"/>
-                    <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="partner_id"/>
-                    <field name="debit" select="1"/>
-                    <field name="credit" select="1"/>
-                    <field name="quantity"/>
-                    <field name="date_maturity"/>
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <field name="sequence"/>
+                        <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="partner_id"/>
+                        <field name="debit"/>
+                        <field name="credit"/>
+                        <field name="quantity"/>
+                        <field name="date_maturity"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -1673,15 +1589,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model">
-                    <field name="name"/>
-                    <field name="journal_id"/>
-                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-                    <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
-                    <separator string="Legend" colspan="4"/>
-                    <field name="legend" colspan="4" nolabel="1"/>
-                    <group col="1" colspan="4">
-                        <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="journal_id"/>
+                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     </group>
+
+                    <field name="lines_id" widget="one2many_list"/>
+                    <separator string="Legend"/>
+                    <field name="legend"/>
+                    <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                 </form>
             </field>
         </record>
@@ -1759,32 +1676,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term">
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
                     <group>
-                        <group colspan="2" col="4">
-                            <field name="name" select="1"/>
-                            <separator string="Amount Computation" colspan="4"/>
-                            <field name="value" colspan="4"/>
-                            <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+                        <group string="Amount Computation">
+                            <field name="value"/>
+                            <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
                         </group>
-                        <group colspan="2" col="4">
-                            <field name="sequence"/>
-                            <separator string="Due Date Computation" colspan="4"/>
-                            <field name="days" colspan="4"/>
-                            <field name="days2" colspan="4"/>
+                        <group string="Due Date Computation">
+                            <field name="days"/>
+                            <field name="days2"/>
                         </group>
                     </group>
-                    <newline/>
-                    <separator string="Example" colspan="4"/>
-                    <label string="At 14 net days 2 percent, remaining amount at 30 days end of month." colspan="4"/>
-                    <group colspan="2" col="2">
+
+                    <separator string="Example"/>
+                    <label string="At 14 net days 2 percent, remaining amount at 30 days end of month."/>
+                    <group>
                         <label string="Line 1:" colspan="2"/>
                         <label string="  Valuation: Percent"/>
                         <label string="  Number of Days: 14"/>
                         <label string="  Value amount: 0.02"/>
                         <label string="  Day of the Month: 0"/>
                     </group>
-                    <newline/>
-                    <group colspan="2" col="2">
+                    <group>
                         <label string="Line 2:" colspan="2"/>
                         <label string="  Valuation: Balance"/>
                         <label string="  Number of Days: 30"/>
@@ -1813,13 +1727,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term">
-                    <separator colspan="4" string="Information"/>
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <separator colspan="4" string="Description on Invoices"/>
-                    <field colspan="4" name="note" nolabel="1"/>
-                    <separator colspan="4" string="Computation"/>
-                    <field colspan="4" name="line_ids" nolabel="1"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
+                    <separator string="Description on Invoices"/>
+                    <field name="note"/>
+                    <separator string="Computation"/>
+                    <field name="line_ids"/>
                 </form>
             </field>
         </record>
@@ -1844,8 +1759,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription lines">
-                    <field name="date"/>
-                    <field name="move_id"/>
+                    <group>
+                        <field name="date"/>
+                        <field name="move_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -1906,34 +1823,33 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Recurring">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="model_id"/>
-                        <field name="ref" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Starts on"/>
-                        <field name="date_start" select="1"/>
-                        <field name="period_total"/>
-                    </group>
-
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Valid Up to"/>
-                        <field name="period_nbr"/>
-                        <field name="period_type"/>
-                    </group>
-
-                    <group col="2" colspan="2">
-                    </group>
-                    <separator colspan="4" string="Subscription Lines"/>
-                    <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
-
-                    <group col="6" colspan="4">
-                        <field name="state"/>
+                    <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"/>
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
+                    </header>
+
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="model_id"/>
+                            <field name="ref"/>
+                        </group>
+                        <newline/>
+
+                        <group string="Starts on">
+                            <field name="date_start"/>
+                            <field name="period_total"/>
+                        </group>
+
+                        <group string="Valid Up to">
+                            <field name="period_nbr"/>
+                            <field name="period_type"/>
+                        </group>
                     </group>
+                    <separator string="Subscription Lines"/>
+                    <field name="lines_id" widget="one2many_list"/>
                 </form>
             </field>
         </record>
@@ -1974,9 +1890,11 @@
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Subscription lines">
-                    <field name="subscription_id"/>
-                    <field name="date"/>
-                    <field name="move_id"/>
+                    <group col="4">
+                        <field name="subscription_id"/>
+                        <field name="date"/>
+                        <field name="move_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -2064,13 +1982,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Account">
+                    <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"/>
+                    </header>
                     <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
                     <field name="cparent_id"/>
-                    <newline/>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
@@ -2109,22 +2026,24 @@
                 <form string="Account Template">
                     <notebook>
                         <page string="General Information">
-                            <field name="name"/>
-                            <field name="code"/>
-                            <newline/>
-                            <field name="parent_id"/>
-                            <field name="shortcut"/>
-                            <field name="type"/>
-                            <field name="user_type"/>
+                            <group col="4">
+                                <field name="name"/>
+                                <field name="code"/>
+                                <newline/>
+                                <field name="parent_id"/>
+                                <field name="shortcut"/>
+                                <field name="type"/>
+                                <field name="user_type"/>
 
-                            <field name="currency_id"/>
-                            <field name="reconcile"/>
-                            <field name="chart_template_id"/>
-                            <separator string="Default Taxes" colspan="4"/>
-                            <field name="tax_ids" colspan="4" nolabel="1"/>
+                                <field name="currency_id"/>
+                                <field name="reconcile"/>
+                                <field name="chart_template_id"/>
+                            </group>
+                            <separator string="Default Taxes"/>
+                            <field name="tax_ids"/>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -2188,28 +2107,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Chart of Accounts Template">
-                    <group>
-                    <field name="name"/>
-                    <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
-                    <field name="bank_account_view_id" attrs="{'required': [('parent_id', '=', False)]}"/>
-                    <field name="tax_code_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
-                    <field name="parent_id" />
-                    <!--<field name="code_digits" />-->
-                    <field name="visible" />
-                    <field name="complete_tax_set" />
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                        <field name="bank_account_view_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                        <field name="tax_code_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                        <field name="parent_id" />
+                        <!--<field name="code_digits" />-->
+                        <field name="visible" />
+                        <field name="complete_tax_set" />
                     </group>
                     <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
-                    <group>
-                    <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_payable" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_expense_categ" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
-                    <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
-                    <field name="property_reserve_and_surplus_account" />
+                    <group col="4">
+                        <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_payable" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_expense_categ" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
+                        <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
+                        <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
             </field>
@@ -2273,51 +2192,52 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Template">
-                    <group colspan="4">
+                    <group col="4">
                         <field name="name"/>
                         <field name="description"/>
-                        <newline/>
                         <field name="chart_template_id"/>
                         <field name="type"/>
                         <field name="type_tax_use"/>
-                        <group colspan="2" col="4">
-                            <field name="price_include"/>
-                        </group>
+                        <field name="price_include"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Tax Definition">
-                            <field name="applicable_type"/>
-                            <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
-                            <field name="include_base_amount"/>
-                            <field name="domain"/>
-                            <newline/>
-                            <field name="account_collected_id"/>
-                            <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
-                            <field name="account_paid_id"/>
-                            <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
-                            <field name="child_depend"/>
-                            <field name="sequence"/>
+                            <group col="4">
+                                <field name="applicable_type"/>
+                                <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                                <field name="include_base_amount"/>
+                                <field name="domain"/>
+                                <newline/>
+                                <field name="account_collected_id"/>
+                                <label colspan="2" string="Keep empty to use the income account"/>
+                                <field name="account_paid_id"/>
+                                <label colspan="2" string="Keep empty to use the expense account"/>
+                                <field name="child_depend"/>
+                                <field name="sequence"/>
+                            </group>
                         </page>
                         <page string="Tax Declaration">
-                            <separator colspan="4" string="Invoices"/>
-                            <field name="base_code_id"/>
-                            <field name="base_sign"/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_sign"/>
+                            <group col="4">
+                                <separator colspan="4" string="Invoices"/>
+                                <field name="base_code_id"/>
+                                <field name="base_sign"/>
+                                <field name="tax_code_id"/>
+                                <field name="tax_sign"/>
 
-                            <separator colspan="4" string="Credit Notes"/>
-                            <field name="ref_base_code_id"/>
-                            <field name="ref_base_sign"/>
-                            <field name="ref_tax_code_id"/>
-                            <field name="ref_tax_sign"/>
+                                <separator colspan="4" string="Credit Notes"/>
+                                <field name="ref_base_code_id"/>
+                                <field name="ref_base_sign"/>
+                                <field name="ref_tax_code_id"/>
+                                <field name="ref_tax_sign"/>
+                            </group>
                         </page>
                         <page string="Special Computation">
-                            <separator colspan="4" string="Compute Code (if type=code)"/>
-                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
-                            <separator colspan="4" string="Compute Code for Taxes Included Prices"/>
-                            <field colspan="4" name="python_compute_inv" nolabel="1"/>
-                            <separator colspan="4" string="Applicable Code (if type=code)"/>
-                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>
+                            <separator string="Compute Code (if type=code)"/>
+                            <field name="python_compute" attrs="{'readonly':[('type','!=','code')]}"/>
+                            <separator string="Compute Code for Taxes Included Prices"/>
+                            <field name="python_compute_inv"/>
+                            <separator string="Applicable Code (if type=code)"/>
+                            <field name="python_applicable" attrs="{'readonly':[('applicable_type','=','true')]}"/>
                         </page>
                     </notebook>
                 </form>
@@ -2402,13 +2322,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Code Template">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="parent_id" select="1"/>
-                    <field name="sign"/>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="info" nolabel="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
+                        <field name="sign"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="info"/>
                 </form>
             </field>
         </record>
@@ -2616,7 +2537,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 layout="manual">
+                <form>
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4536e31621c..28e62af0498 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -379,7 +379,7 @@
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" />
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_form_button_box">