From 001d2e84c9dcb96ebcdd28f8015e447d6a7030c5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 7 Jun 2012 19:30:07 +0200
Subject: [PATCH] [IMP] form views

bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
---
 addons/email_template/email_template_view.xml |  59 +++---
 addons/event/event_view.xml                   |  48 ++---
 addons/fetchmail/fetchmail_view.xml           |  39 ++--
 addons/hr/hr_department_view.xml              |   8 +-
 addons/hr/hr_view.xml                         | 160 ++++++++--------
 addons/hr/res_config_view.xml                 |  36 ++--
 addons/hr_attendance/hr_attendance_view.xml   |  16 +-
 addons/hr_contract/hr_contract_view.xml       |  54 +++---
 addons/hr_evaluation/hr_evaluation_view.xml   | 154 +++++++--------
 addons/hr_expense/hr_expense_view.xml         |  35 ++--
 addons/hr_holidays/hr_holidays_view.xml       |  92 +++++----
 addons/hr_payroll/hr_payroll_view.xml         | 175 +++++++++---------
 addons/hr_recruitment/hr_recruitment_view.xml |  89 ++++-----
 addons/hr_timesheet/hr_timesheet_view.xml     |  37 ++--
 .../hr_timesheet_invoice_view.xml             |  12 +-
 .../hr_timesheet_sheet_view.xml               |  33 ++--
 addons/idea/idea_view.xml                     |  68 +++----
 17 files changed, 545 insertions(+), 570 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 127d255ec6b..feb4d54a1ed 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -8,26 +8,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Templates">
-                    <field name="name" required="1"/>
-                    <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
-                    <field name="model" invisible="1"/>
-                    <notebook colspan="4">
+                    <group col="4">
+                        <field name="name" required="1"/>
+                        <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
+                        <field name="model" invisible="1"/>
+                    </group>
+                    <notebook>
                         <page string="Email Details">
-                            <group col="2" colspan="2">
-                                <separator string="Addresses" colspan="2"/>
+                            <group>
+                            <group string="Addresses">
                                 <field name="email_from" required="1"/>
                                 <field name="email_to" required="1"/>
                                 <field name="email_cc"/>
                                 <field name="email_bcc"/>
                                 <field name="reply_to"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <separator string="Options" colspan="2"/>
+                            <group string="Options">
                                 <field name="lang"/>
                                 <field name="user_signature"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Email Content"/>
+                            <group string="Email Content">
                                 <field name="subject" required="1"/>
                                 <notebook  colspan="2">
                                     <page string="Body (Text)">
@@ -39,26 +39,25 @@
                                     </page>
                                 </notebook>
                             </group>
-                            <group col="4" colspan="2">
-                                <notebook colspan="4">
-                                    <page string="Dynamic Values Builder">
-                                        <field name="model_object_field"
-                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field)"
-                                            colspan="4"/>
-                                        <field name="sub_object" readonly="1" colspan="4"/>
-                                        <field name="sub_model_object_field"
-                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            colspan="4"
-                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                        <field name="null_value" colspan="4"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
-                                        <field name="copyvalue" colspan="4"/>
-                                    </page>
-                                </notebook>
-                                <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                    type="action" colspan="4" target="new" icon="gtk-zoom-fit" context="{'template_id':active_id}"/>
+                            <notebook colspan="4">
+                                <page string="Dynamic Values Builder">
+                                    <field name="model_object_field"
+                                        domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                        on_change="onchange_sub_model_object_value_field(model_object_field)"
+                                        colspan="4"/>
+                                    <field name="sub_object" readonly="1" colspan="4"/>
+                                    <field name="sub_model_object_field"
+                                        domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                        colspan="4"
+                                        attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
+                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                    <field name="null_value" colspan="4"
+                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
+                                    <field name="copyvalue" colspan="4"/>
+                                </page>
+                            </notebook>
+                            <button name="%(wizard_email_template_preview)d" string="Preview Template"
+                                type="action" colspan="4" target="new" icon="gtk-zoom-fit" context="{'template_id':active_id}"/>
                             </group>
                         </page>
                         <page string="Advanced">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e5442b5ec5f..1ec3c1cfac7 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -14,12 +14,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Event Type">
-                    <field name="name" select="1"/>
-                    <field name="default_reply_to"/>
-                    <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                    <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
-                    <field name="default_registration_min"/>
-                    <field name="default_registration_max"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="default_reply_to"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_registration_min"/>
+                        <field name="default_registration_max"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -60,25 +62,25 @@
                 </header>
                 <sheet layout="manual">
 
-
-                <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
-                <group colspan="4" col="5">
-                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
+                <div class="oe_right" style="height: 200px"></div>
+                <div class="oe_form_title">
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="type" on_change="onchange_event_type(type,context)"/>
+                            <field name="user_id"/>
+                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
+                        </group>
+                        <group>
+                            <field name="date_begin"/>
+                            <field name="date_end"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="register_min"/>
-                        <field name="register_max"/>
-                    </group>
-                </group>
+                </div>
 
-                <div class="oe_form_google_map" style="height: 200px"></div>
-
-                <notebook colspan="4">
+                <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 3ec8eb1515d..2f92891ab86 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -25,51 +25,46 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="type" select="1" on_change="onchange_server_type(type, is_ssl, object_id)"/>
-                        <field name="date" select="1"/>
+                    <header attrs="{'invisible' : [('type', '=', 'local')]}">
+                        <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
+                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
+                        <field name="state" widget="statusbar"/>
+                    </header>
+                    <group>
+                        <field name="name"/>
+                        <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
+                        <field name="date"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Server &amp; Login">
-                            <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
-                                <separator string="Server Information" colspan="2"/>
+                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
                                 <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
                                 <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
                                 <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                             </group>
-                            <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
-                                <separator string="Login Information" colspan="2"/>
+                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Login Information">
                                 <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
                                 <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <separator string="Actions to Perform on Incoming Mails" colspan="2"/>
+                            <group string="Actions to Perform on Incoming Mails">
                                 <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                                 <field name="action_id"/>
                             </group>
-                            <group attrs="{'invisible' : [('type', '!=', 'local')]}" colspan="4" col="4">
-                                <separator string="Configuration" colspan="4"/>
+                            <group attrs="{'invisible' : [('type', '!=', 'local')]}" string="Configuration">
                                 <field name="configuration" colspan="4"/>
                                 <field name="script" colspan="4" widget="url"/>
                             </group>
                         </page>
                         <page string="Advanced" groups="base.group_no_one">
-                            <group colspan="2" col="2">
-                                <separator string="Advanced Options" colspan="2"/>
+                            <group string="Advanced Options" col="4">
                                 <field name="priority"/>
                                 <field name="attach"/>
                                 <field name="original"/>
-                                <field name="active" select="1"/>
+                                <field name="active"/>
                             </group>
                         </page>
                     </notebook>
-                    <group colspan="4" col="6" attrs="{'invisible' : [('type', '=', 'local')]}">
-                        <field name="state"/>
-                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
-                        <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 0a66fd478b9..4e2746e2c27 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,11 +13,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
                         <field name="parent_id"/>
-                        <field name="manager_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                        <field name="manager_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 461ba8fd71a..dea72fc3db2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -23,59 +23,63 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee">
-                    <group colspan="4" col="8">
-                        <group colspan="6" col="6">
-                        <field colspan="6" name="name" />
-                        <field name="user_id" on_change="onchange_user(user_id)"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                        <field name="active"/>
-                        <newline/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)" />
-                        <field name="parent_id" />
-                        </group>
-                        <group colspan="2" col="1">
-                          <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                        </group>
-                    </group>
-                    <notebook colspan="6">
+                    <sheet>
+                    <div class="oe_right oe_form_button_box">
+                        <!-- Put here related buttons -->
+                    </div>
+                    <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
+                    <div class="oe_form_title">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
+                        <label for="department_id" class="oe_form_readonly_hidden"/>
+                        <h2>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>,
+                            <field name="department_id" on_change="onchange_department_id(department_id)" />
+                        </h2>
+                    </div>
+                    <notebook>
                         <page string="Personal Information">
-                            <group col="2" colspan="2" groups="base.group_hr_user">
-                                <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid"/>
-                                <field name="identification_id"/>
-                                <field name="passport_id"/>
-                                <field name="otherid"/>
-                            </group>
-                            <group col="2" colspan="2" groups="base.group_hr_user">
-                                <separator string="Status" colspan="2"/>
-                                <field name="gender"/>
-                                <field name="marital"/>
-                                <field name="country_id"/>
-                                <field name="birthday"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="address_home_id" colspan="2"/>
-                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" />
-                                <field name="work_phone"/>
-                                <field name="mobile_phone"/>
-                                <field name="work_email" widget="email" />
-                                <field name="work_location"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Job Information" colspan="2"/>
-                                <field name="job_id" domain="[('state','!=','old')]"/>
-                                <field name="coach_id" />
+                            <group>
+                                <group>
+                                    <field name="user_id" on_change="onchange_user(user_id)"/>
+                                    <field name="active"/>
+                                    <field name="parent_id" />
+                                </group>
+                                <group groups="base.group_hr_user" string="Social IDs">
+                                    <field name="ssnid"/>
+                                    <field name="sinid"/>
+                                    <field name="identification_id"/>
+                                    <field name="passport_id"/>
+                                    <field name="otherid"/>
+                                </group>
+                                <group groups="base.group_hr_user" string="Status">
+                                    <field name="gender"/>
+                                    <field name="marital"/>
+                                    <field name="country_id"/>
+                                    <field name="birthday"/>
+                                </group>
+                                <group string="Contact Information">
+                                    <field name="address_home_id"/>
+                                    <field name="address_id" on_change="onchange_address_id(address_id)" />
+                                    <field name="work_phone"/>
+                                    <field name="mobile_phone"/>
+                                    <field name="work_email" widget="email" />
+                                    <field name="work_location"/>
+                                </group>
+                                <group string="Job Information">
+                                    <field name="job_id" domain="[('state','!=','old')]"/>
+                                    <field name="coach_id" />
+                                </group>
                             </group>
                         </page>
                         <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" nolabel="1"/>
+                            <field name="category_ids"/>
                         </page>
                         <page string="Notes" groups="base.group_hr_user">
-                            <field colspan="4" nolabel="1" name="notes"/>
+                            <field name="notes"/>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -271,10 +275,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
-                    <field name="name" />
-                    <field name="parent_id" />
-                    <separator string="Employees" colspan="4" />
-                    <field name="employee_ids" colspan="4" nolabel="1" />
+                    <group>
+                        <field name="name" />
+                        <field name="parent_id" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -345,36 +349,34 @@
             <field name="model">hr.job</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
-                <header>
-                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                    <button name="job_open" string="In Position" states="old,recruit" type="object"/>
-                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
-                </header>
-                <sheet string="Job" layout="auto">
-                    <group col="6" colspan="4">
-                    <field name="name" />
-                    <field name="department_id" />
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                    <field name="no_of_employee"/>
-                    <field name="expected_employees"/>
-                    </group>
-                    <newline/>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <separator colspan="4" string="Job Description"/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <separator colspan="4" string="Requirements"/>
-                            <field name="requirements" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Employees">
-                            <field name="employee_ids" colspan="4" nolabel="1" widget="many2many" mode="tree,form"/>
-                        </page>
-                    </notebook>
-                </sheet>
+                <form string="Job">
+                    <header>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                        <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
+                    </header>
+                    <sheet>
+                        <group col="4">
+                            <field name="name" />
+                            <field name="department_id" />
+                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            <field name="no_of_employee"/>
+                            <field name="expected_employees"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <notebook>
+                            <page string="Description">
+                                <separator string="Job Description"/>
+                                <field name="description"/>
+                                <separator string="Requirements"/>
+                                <field name="requirements"/>
+                            </page>
+                            <page string="Employees">
+                                <field name="employee_ids" widget="many2many" mode="tree,form"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e6b55ba45f0..4cb42f55585 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -14,29 +14,31 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Human Resources" layout="manual">
+                <form string="Configure Human Resources">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Additional Features" colspan="4"/>
-                        <field name="module_hr_expense"/>
-                        <field name="module_hr_recruitment"/>
-                        <field name="module_hr_evaluation"/>
-                        <field name="module_hr_contract"/>
-                        <field name="module_hr_holidays"/>
-                        <newline/>
-                        <field name="module_hr_payroll"/>
-                        <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                            string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
+                    <sheet>
+                        <group col="4">
+                            <separator string="Additional Features" colspan="4"/>
+                            <field name="module_hr_expense"/>
+                            <field name="module_hr_recruitment"/>
+                            <field name="module_hr_evaluation"/>
+                            <field name="module_hr_contract"/>
+                            <field name="module_hr_holidays"/>
+                            <newline/>
+                            <field name="module_hr_payroll"/>
+                            <button colspan="2" name="%(open_payroll_modules)d" type="action"
+                                string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
 
-                        <separator string="Timesheets" colspan="4"/>
-                        <field name="module_hr_attendance"/>
-                        <field name="module_hr_timesheet"/>
-                        <field name="module_hr_timesheet_sheet"/>
+                            <separator string="Timesheets" colspan="4"/>
+                            <field name="module_hr_attendance"/>
+                            <field name="module_hr_timesheet"/>
+                            <field name="module_hr_timesheet_sheet"/>
 
-                        <group name="config_recruitment" colspan="4"/>
+                            <group name="config_recruitment" colspan="4"/>
+                         </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 258177bfd5e..b4cde27484d 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,10 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances">
-                    <field name="employee_id"  />
-                    <field name="name"  />
-                    <field name="action"  />
-                    <field name="action_desc"  />
+                    <group>
+                        <field name="employee_id"/>
+                        <field name="name"/>
+                        <field name="action"/>
+                        <field name="action_desc"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -89,8 +91,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="action_type" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="action_type"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 9e0017fed8c..6f2ad46e913 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -67,39 +67,39 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract">
-                    <group colspan="3" col="6">
+                    <group col="4">
                         <field name="name" />
                         <field name="employee_id" />
                         <field name="job_id"/>
                         <field name="wage"/>
                         <field name="type_id" widget="selection"/>
                     </group>
-                    <notebook colspan='4'>
-                    <page string="Information" name="information">
-                        <group col="2" colspan="2" name="left_column">
-                            <separator colspan="2" string="Duration"/>
-                            <field name="date_start" />
-                            <field name="date_end" />
-                            <field name="working_hours"/>
-                            <separator colspan="2" string="Trial Period"/>
-                            <field name="trial_date_start" />
-                            <field name="trial_date_end" />
-                        </group>
-                            <group col="2" colspan="2" name="right_column">
-                            <separator name="advantages" colspan="2" string="Advantages"/>
-                            <field name="advantages" nolabel="1" colspan="2"/>
-                        </group>
-                        <separator colspan="4" string="Notes"/>
-                        <field colspan="4" name="notes" nolabel="1"/>
-                    </page>
-                    <page string="Work Permit">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Valid for"/>
-                            <field name="visa_no"/>
-                            <field name="permit_no"/>
-                            <field name="visa_expire"/>
-                        </group>
-                    </page>
+                    <notebook>
+                        <page string="Information" name="information">
+                            <group>
+                                <group name="left_column" string="Duration">
+                                    <field name="date_start" />
+                                    <field name="date_end" />
+                                    <field name="working_hours"/>
+                                </group>
+                                <group string="Trial Period">
+                                    <field name="trial_date_start" />
+                                    <field name="trial_date_end" />
+                                </group>
+                                <group name="right_column" string="Advantages">
+                                    <field name="advantages" nolabel="1" colspan="2"/>
+                                </group>
+                            </group>
+                            <separator string="Notes"/>
+                            <field name="notes"/>
+                        </page>
+                        <page string="Work Permit">
+                            <group string="Valid for">
+                                <field name="visa_no"/>
+                                <field name="permit_no"/>
+                                <field name="visa_expire"/>
+                            </group>
+                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 3c6c554425e..a215e04a3bf 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -26,17 +26,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Appraisal Plan">
-                    <group col="8" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="month_first"/>
                         <field name="month_next"/>
-                        <newline/>
                         <field name="active"/>
                     </group>
-                     <notebook colspan="4">
+                     <notebook>
                          <page string="Appraisal Phases">
-                            <field name="phase_ids" nolabel="1" colspan="4"/>
+                            <field name="phase_ids"/>
                          </page>
                      </notebook>
                 </form>
@@ -75,46 +74,39 @@
                 <form string="Appraisal Plan Phases">
                  <notebook>
                    <page string="General">
+                    <group>
                     <field name="plan_id" invisible="1"/>
-                    <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="wait"/>
-                        <field name="sequence"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="Action to Perform" colspan="4"/>
-                        <field name="action"/>
-                        <field name="survey_id" domain="[('state','=','open')]"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <group col="4" colspan="2">
-                            <separator string="Send to Managers" colspan="2"/>
-                            <newline/>
-                            <field name="send_answer_manager"/>
-                            <newline/>
-                            <field name="send_anonymous_manager"/>
+                        <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="wait"/>
+                            <field name="sequence"/>
                         </group>
-                        <group col="4" colspan="2">
-                            <separator string="Send to Employees" colspan="2"/>
-                            <newline/>
+                        <group>
+                            <separator string="Action to Perform" colspan="4"/>
+                            <field name="action"/>
+                            <field name="survey_id" domain="[('state','=','open')]"/>
+                        </group>
+                        <group string="Send to Managers">
+                            <field name="send_answer_manager"/>
+                            <field name="send_anonymous_manager"/>
+                        </group><group string="Send to Employees">
                             <field name="send_answer_employee"/>
-                            <newline/>
                             <field name="send_anonymous_employee"/>
                         </group>
+                        </group>
                     </group>
                     </page>
                     <page string="Mail Settings">
-                        <field name="mail_feature" colspan="4"/>
-                        <newline/>
+                        <field name="mail_feature"/>
                         <separator string="Mail Body"/>
-                        <newline/>
-                        <field name="mail_body" colspan="4" nolabel="1"/>
-                        <newline/>
-                        <separator string="Legend" colspan ="4"/>
-                          <label string=" (employee_name)s: Partner name" colspan="2"/>
-                          <label string="(user_signature)s: User name" colspan="2"/>
-                          <label string="(date)s: Current Date" colspan="2"/>
-                          <label string="(eval_name)s:Appraisal Name" colspan="2"/>
+                        <field name="mail_body"/>
+                        <group string="Legend">
+                            <label string=" (employee_name)s: Partner name"/>
+                            <label string="(user_signature)s: User name"/>
+                            <label string="(date)s: Current Date"/>
+                            <label string="(eval_name)s:Appraisal Name"/>
+                        </group>
                     </page>
                   </notebook>
                 </form>
@@ -154,7 +146,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Appraisal">
                 <header>
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
@@ -163,48 +155,48 @@
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </header>
-                <sheet string="Appraisal" layout="auto">
-                    <group col="4" colspan="3">
-                        <separator string="Appraisal Data" colspan="4"/>
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="plan_id"/>
-                        <field name="date"/>
+                <sheet>
+                    <group>
+                        <group string="Appraisal Data">
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="plan_id"/>
+                            <field name="date"/>
+                        </group>
+                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}" string="Ending Summary">
+                            <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
+                            <field name="date_close" readonly="1"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="1" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
-                        <separator string="Ending Summary" colspan="2"/>
-                        <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
-                        <field name="date_close" readonly="1"/>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="survey_request_ids" nolabel="1" colspan="4" widget="one2many">
+                            <field name="survey_request_ids">
                                 <form string="Interview Appraisal">
-                                    <group col="4" colspan="4">
+                                    <group col="4">
                                         <field name="survey_id"/>
-                                        <group col="2" colspan="2">
+                                        <div colspan="2">
                                             <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                        </group>
+                                        </div>
                                         <field name="date_deadline"/>
                                         <field name="response" readonly="1"/>
                                         <field name="user_to_review_id"/>
                                         <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <newline/>
-                                    <separator string="Status" colspan="4"/>
-                                    <group colspan="4" col="6">
+                                    <group col="4" string="Status">
                                          <field name="state"/>
-                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                         <div>
+                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                         </div>
                                     </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_action" colspan="4" nolabel="1"
+                            <field name="note_action"
                                 groups="base.group_hr_manager"/>
                         </page>
                         <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_summary" colspan="4" nolabel="1"/>
+                            <field name="note_summary"/>
                         </page>
                     </notebook>
               </sheet>
@@ -282,29 +274,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Interview Appraisal">
-                    <group col="4" colspan="4">
-                         <field name="user_to_review_id"/>
-                         <field name="user_id" string="Interviewer"/>
-                         <field name="date_deadline"/>
-                          <group col="4" colspan="4">
-                                <field name="survey_id"/>
-                                <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                <newline/>
-                                <field name="evaluation_id"/>
-                                <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
-                                <newline/>
-                                <field name="response" readonly="1"/>
-                                <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <header>
+                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
+                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                        <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
+
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
+
+                        <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
+                    </header>
+                    <sheet>
+                        <group col="4">
+                             <field name="user_to_review_id"/>
+                             <field name="user_id" string="Interviewer"/>
+                             <field name="date_deadline"/>
+                             <field name="survey_id"/>
+                             <field name="evaluation_id"/>
+                             <field name="response" readonly="1"/>
                         </group>
-                    </group>
-                    <newline/>
-                    <separator string="Status" colspan="4"/>
-                    <group colspan="4" col="6">
-                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
-                                <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
-                                <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2fc1340fd23..b8e699e278f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Expenses Sheet">
                 <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -72,8 +72,8 @@
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
-                <sheet string="Expenses Sheet" layout="auto">
-                    <group colspan="4" col="6">
+                <sheet>
+                    <group col="4">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name"/>
                         <field name="ref"/>
@@ -82,10 +82,9 @@
                         <field name="department_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Description">
-                            <newline/>
-                            <field colspan="4" name="line_ids" nolabel="1" context="{'currency_id': currency_id}">
+                            <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines">
                                     <group col="6" colspan="4">
                                         <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
@@ -108,19 +107,19 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Accounting Data"/>
-                            <field name="journal_id"/>
-                            <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+                            <group>
+                                <group string="Accounting Data">
+                                    <field name="journal_id"/>
+                                    <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Validation">
+                                    <field name="date_confirm" readonly="1"/>
+                                    <field name="date_valid" readonly="1"/>
+                                    <field name="user_valid"/>
+                                </group>
                             </group>
-                            <group col="2" colspan="2" groups="base.group_no_one">
-                                <separator colspan="2" string="Validation"/>
-                                <field name="date_confirm" readonly = "1"/>
-                                <field name="date_valid" readonly = "1"/>
-                                <field name="user_valid"/>
-                            </group>
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <separator string="Notes"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 58abaae02ac..f0f809922a7 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -112,7 +112,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Allocation Request">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
@@ -121,28 +121,25 @@
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
-                <sheet string="Allocation Request" layout="auto">
-                <group col="8" colspan="4" class="oe_form_header">
+                <sheet>
+                <group>
                     <field name="name"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
-                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
-                        </group>
-                        <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
-                        </group>
+                    <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                     <page string="General">
-                        <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                        <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                        <field name="number_of_days_temp"/>
-                        <field name="double_validation" invisible="1"/>
-                        <newline/>
-                        <field name="manager_id"/>
-                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                        <separator string="Reasons" colspan="4"/>
-                        <field name="notes" nolabel="1" colspan="4"/>
+                        <group col="4">
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
+                            <field name="number_of_days_temp"/>
+                            <field name="double_validation" invisible="1"/>
+                            <field name="manager_id"/>
+                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                        </group>
+                        <separator string="Reasons"/>
+                        <field name="notes"/>
                     </page>
                 </notebook>
             </sheet>
@@ -182,26 +179,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Management">
-                    <field name="name"/>
-                    <field name="holiday_status_id"/>
-                    <field name="type"/>
-                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                    <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                    <field name="number_of_days_temp"/>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <field name="manager_id"/>
-                            <field name="notes" colspan="4"/>
-                            <newline/>
-                            <field name="state" colspan="2"/>
-                            <group colspan="2">
-                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate,draft" type="workflow" icon="gtk-no"/>
-                                <button string="Reset to New" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <header>
+                        <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                        <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                        <button string="Refuse" name="refuse" states="confirm,validate,draft" type="workflow" icon="gtk-no"/>
+                        <button string="Reset to New" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                        <field name="state"/>
+                    </header>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="holiday_status_id"/>
+                        <field name="type"/>
+                        <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                        <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                        <field name="number_of_days_temp"/>
+                        <field name="manager_id"/>
+                    </group>
+                    <field name="notes"/>
                 </form>
             </field>
         </record>
@@ -376,21 +370,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type">
-                    <group colspan="4" col="6">
+                    <group col="4">
                         <field name="name"/>
                         <field name="color_name"/>
                         <field name="categ_id" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                       <page string="Details">
-                          <group colspan="2" col="2" name="selection">
-                              <separator string="Validation" colspan="2"/>
-                              <field name="double_validation"/>
-                              <field name="limit"/>
-                          </group>
-                          <group name="second" colspan="2" col="2">
-                              <separator string="Misc" colspan="2"/>
-                              <field name="active"/>
+                          <group>
+                              <group name="selection" string="Validation">
+                                  <field name="double_validation"/>
+                                  <field name="limit"/>
+                              </group>
+                              <group name="second" string="Misc">
+                                  <field name="active"/>
+                              </group>
                           </group>
                       </page>
                     </notebook>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f2626670523..4d2b80adf4f 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -107,15 +107,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Function">
-                    <group col="6" colspan="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="parent_id"/>
                     </group>
                     <notebook colspan="4">
                          <page string="Salary Rules">
-                           <field colspan="4" name="rule_ids" nolabel="1" domain="[('parent_rule_id','=',False)]">
+                           <field name="rule_ids" domain="[('parent_rule_id','=',False)]">
                              <tree>
                                 <field name="name"/>
                                 <field name="code"/>
@@ -185,26 +185,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslip Line">
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="4" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="slip_id" select="1"/>
+                <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="slip_id"/>
                         <field name="employee_id"/>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Calculations"/>
+                    <group string="Calculations">
                         <field name="category_id"/>
                         <field name="amount_select"/>
                         <field name="amount_fix"  attrs="{'readonly':[('amount_select','&lt;&gt;','fix')]}"/>
                         <field name="amount_percentage"  attrs="{'readonly':[('amount_select','&lt;&gt;','percentage')]}"/>
                         <field name="sequence"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <separator colspan="4" string="Description"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="note"/>
+                </group>
                 </form>
             </field>
         </record>
@@ -260,7 +256,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Payslip">
                 <header>
                     <button string="Confirm" name="hr_verify_sheet" states="draft"/>
                     <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
@@ -269,20 +265,24 @@
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Payslip" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                        <field name="number"/>
-                        <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
+                <sheet>
+                    <label for="employee_id" class="oe_form_readonly_hidden">
+                    <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
+                    <label for="date_from" class="oe_form_readonly_hidden" string="Period">
+                    <h2>
+                        from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
+                        to <field name="date_to"/>
+                    </h2>
+                    <group col="4">
                         <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
-                        <field name="date_to"/>
-                        <field name="name" colspan="4"/>
+                        <field name="name"/>
                         <field name="credit_note"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Worked Days &amp; Inputs">
-                            <field name="worked_days_line_ids" colspan="4" nolabel="1">
+                            <field name="worked_days_line_ids">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
@@ -292,9 +292,9 @@
                                     <field name="sequence" invisible="True"/>
                                 </tree>
                                 <form string="Worked Day">
-                                    <group>
-                                        <field name="name" select="1"/>
-                                        <field name="code" select="1"/>
+                                    <group col="4">
+                                        <field name="name"/>
+                                        <field name="code"/>
                                         <field name="payslip_id"/>
                                         <field name="sequence"/>
                                         <field name="number_of_days"/>
@@ -312,9 +312,9 @@
                                     <field name="sequence" invisible="True"/>
                                 </tree>
                                 <form string="Payslip Line">
-                                    <group>
-                                        <field name="name" select="1"/>
-                                        <field name="code" select="1"/>
+                                    <group col="4">
+                                        <field name="name"/>
+                                        <field name="code"/>
                                         <field name="payslip_id"/>
                                         <field name="sequence"/>
                                         <field name="amount"/>
@@ -336,9 +336,9 @@
                                     <field name="total"/>
                                 </tree>
                                 <form string="Payslip Line">
-                                    <group>
-                                        <field name="name" select="1"/>
-                                        <field name="code" select="1"/>
+                                    <group col="4">
+                                        <field name="name"/>
+                                        <field name="code"/>
                                         <field name="category_id"/>
                                         <field name="sequence"/>
                                         <field name="quantity"/>
@@ -351,7 +351,7 @@
                             </field>
                         </page>
                         <page string="Details By Salary Rule Category">
-                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
+                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]">
                                 <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
                                     <field name="name"/>
@@ -361,15 +361,13 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <separator colspan="4" string="Other Information"/>
-                            <group col="5" colspan="2">
+                            <group col="2" string="Other Information">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                 <field name="payslip_run_id" domain="[('state','=','draft')]"/>
                                 <field name="paid" readonly="1"/>
                             </group>
-                            <newline/>
-                            <separator colspan="4" string="Notes"/>
-                            <field name="note" colspan="4" nolabel="1"/>
+                            <group string="Notes">
+                            <field name="note"/>
                        </page>
                     </notebook>
                     </sheet>
@@ -422,13 +420,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Categories">
-                    <group col="3" colspan="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="parent_id" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
                     </group>
-                    <separator colspan="4" string="Notes"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -530,14 +528,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contribution">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <notebook colspan="4">
-                         <page string="Description">
-                            <separator colspan="4" string="Description"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="name"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <separator string="Description"/>
+                    <field name="note" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -593,10 +587,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Rules">
-                    <group col="6" colspan="6">
-                       <field name="name"/>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="category_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="category_id"/></h2>
+
+                    <group col="4">
                        <field name="code" select="1"/>
-                       <field name="category_id"/>
                        <field name="sequence" />
                        <field name="active"/>
                        <field name="appears_on_payslip"/>
@@ -604,31 +601,31 @@
                     </group>
                     <notebook colspan="6">
                         <page string="General">
-                                <group col="4" colspan="6">
-                                    <separator colspan="4" string="Conditions"/>
-                                    <field name="condition_select"/><newline/>
-                                    <field name="condition_python" attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}" colspan="4"/> <newline/>
-                                    <field name="condition_range" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
-                                    <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
-                                    <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
-                                    <separator colspan="4" string="Computation"/>
-                                    <field name="amount_select"/><newline/>
-                                    <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/><newline/>
-                                    <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
-                                    <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/>
-                                    <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
-                                    <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-                                    <separator colspan="4" string="Company Contribution"/>
-                                    <field name="register_id"/>
-                                </group>
+                            <group col="4">
+                                <separator colspan="4" string="Conditions"/>
+                                <field name="condition_select"/><newline/>
+                                <field name="condition_python" attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}" colspan="4"/> <newline/>
+                                <field name="condition_range" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
+                                <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
+                                <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
+                                <separator colspan="4" string="Computation"/>
+                                <field name="amount_select"/><newline/>
+                                <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/><newline/>
+                                <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
+                                <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/>
+                                <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
+                                <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
+                                <separator colspan="4" string="Company Contribution"/>
+                                <field name="register_id"/>
+                            </group>
                         </page>
                         <page string="Child Rules">
                            <field name="parent_rule_id"/>
-                           <separator colspan="4" string="Children Definition"/>
-                           <field colspan="4" name="child_ids" nolabel="1"/>
+                           <separator string="Children Definition"/>
+                           <field name="child_ids"/>
                         </page>
                            <page string="Inputs">
-                                <field name="input_ids" colspan="4" nolabel="1" mode="tree, form">
+                                <field name="input_ids" mode="tree, form">
                                     <tree string="Input Data" editable="bottom">
                                         <field name="name"/>
                                         <field name="code"/>
@@ -636,7 +633,7 @@
                                 </field>
                            </page>
                         <page string="Description">
-                            <field name="note" colspan="4" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -649,9 +646,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
-                    <group col="8" colspan="4">
+                    <group col="8">
                         <field name="name"/>
-                        <field name="code" select="1"/>
+                        <field name="code"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
@@ -721,26 +718,22 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Payslips Batches">
                 <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
                     <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
                     <field name="state" widget="statusbar"/>
                 </header>
-                <sheet string="Payslips Batches" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="name" colspan="4"/>
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
                         <field name="credit_note"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Payslips">
-                            <field name="slip_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                    </sheet>
+                    <field name="slip_ids"/>
+                </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 19039fc0dc9..4732d4a2a09 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -70,7 +70,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Jobs - Recruitment Form">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
@@ -88,8 +88,8 @@
                         states="open" icon="gtk-go-forward"/>
                 <field name="stage_id" widget="statusbar"/>
             </header>
-            <sheet string="Jobs - Recruitment Form" layout="auto">
-                <group colspan="4" col="4">
+            <sheet>
+                <group col="4">
                     <field name="name" string="Subject"/>
                     <group colspan="2" col="4">
                         <field name="partner_name"/>
@@ -112,42 +112,42 @@
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
-                        <group col="3" colspan="2">
-                            <separator colspan="3" string="Contact"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
-                            <button string="Create Partner"
-                                    name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
-                            <newline/>
-                            <field name="email_from" colspan="3"/>
-                            <field name="partner_phone" colspan="3"/>
-                            <field name="partner_mobile" colspan="3"/>
-                        </group>
-                        <group col="3" colspan="2">
-                            <separator colspan="3" string="Contract Data"/>
-                            <field name="availability" colspan="3"/>
-                            <field name="salary_expected"/>
-                            <field name="salary_expected_extra" nolabel="1"/>
-                            <field name="salary_proposed"/>
-                            <field name="salary_proposed_extra" nolabel="1"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Qualification"/>
-                            <field name="type_id"/>
-                            <field name="priority" string="Appreciation"/>
-                            <field name="source_id"/>
-                            <field name="reference"/>
-                        </group>
-                        <group col="2" colspan="2">
-                           <separator colspan="2" string="Dates"/>
-                           <field name="create_date"/>
-                           <field name="write_date"/>
-                           <field name="date_closed"/>
-                           <field name="date_open"/>
+                        <group>
+                            <group string="Contact">
+                                <label for="partner_id">
+                                <div>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
+                                    <button string="Create Partner"
+                                        name="%(action_hr_recruitment_partner_create)d"
+                                        icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
+                                </div>
+                                <field name="email_from"/>
+                                <field name="partner_phone"/>
+                                <field name="partner_mobile"/>
+                            </group>
+                            <group string="Contract Data">
+                                <field name="availability"/>
+                                <field name="salary_expected"/>
+                                <field name="salary_expected_extra" nolabel="1"/>
+                                <field name="salary_proposed"/>
+                                <field name="salary_proposed_extra" nolabel="1"/>
+                            </group>
+                            <group string="Qualification">
+                                <field name="type_id"/>
+                                <field name="priority" string="Appreciation"/>
+                                <field name="source_id"/>
+                                <field name="reference"/>
+                            </group>
+                            <group string="Dates">
+                               <field name="create_date"/>
+                               <field name="write_date"/>
+                               <field name="date_closed"/>
+                               <field name="date_open"/>
+                            </group>
                         </group>
                    </page>
                  <page string="Notes">
-                     <field name="description" nolabel="1" colspan="4"/>
+                     <field name="description"/>
                  </page>
                 </notebook>
             </sheet>
@@ -379,15 +379,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Stage">
-                <group colspan="4" col="6">
-                    <separator string="Stage Definition" colspan="6"/>
-                    <field name="name" select="1"/>
+                <group col="4" string="Stage Definition">
+                    <field name="name"/>
                     <field name="department_id"/>
                     <field name="sequence"/>
                     <field name="state"/>
                 </group>
-                <separator string="Requirements" colspan="4"/>
-                <field name="requirements" nolabel="1" colspan="4"/>
+                <separator string="Requirements"/>
+                <field name="requirements"/>
             </form>
         </field>
     </record>
@@ -431,8 +430,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Degree">
-                    <field name="name" select="1"/>
+                <group>
+                    <field name="name"/>
                     <field name="sequence"/>
+                </group>
             </form>
         </field>
     </record>
@@ -471,7 +472,9 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Sources of Applicants">
-                <field name="name"/>
+                <group>
+                    <field name="name"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index fdf8b20760d..3dc825e4519 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -27,28 +27,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
-                    <field name="date" select="1" on_change="on_change_date(date)"/>
+                    <group col="4">
+                        <field name="name" colspan="4"/>
+                        <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                        <field name="date" on_change="on_change_date(date)"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Information">
-                            <group colspan="2" col="2">
-                                <separator string="Product" colspan="2"/>
-                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
-                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Accounting" colspan="2"/>
-                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
-                                <field name="amount"/>
-                                <field name="general_account_id"/>
-                                <field name="journal_id"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Invoicing" colspan="2"/>
+                            <group>
+                                <group string="Product">
+                                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
+                                </group>
+                                <group string="Accounting">
+                                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                    <field name="amount"/>
+                                    <field name="general_account_id"/>
+                                    <field name="journal_id"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index f9486982432..b75f8398bdf 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -11,13 +11,13 @@
                     <field name="partner_id" on_change="on_change_partner_id(partner_id, context)"/>
                 </field>
                 <group name="contract" position="after">
-                    <group colspan="2" col="2" name="invoice_data">
+                    <group name="invoice_data">
                         <separator colspan="2" string="Invoicing Data"/>
                         <field name="to_invoice" widget="selection"/>
                         <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
                         <field name="amount_max"/>
                     </group>
-                    <group colspan="2" col="2" name="invoice_stats">
+                    <group name="invoice_stats">
                         <separator colspan="4" string="Invoicing Statistics"/>
                         <field name="amount_invoiced"/>
                     </group>
@@ -159,9 +159,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Type of invoicing">
-                    <field colspan="1" name="name"/>
-                    <field colspan="1" name="customer_name"/>
-                    <field colspan="2" name="factor"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="customer_name"/>
+                        <field name="factor"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index afd04aed1e1..a4f11225a7e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -20,10 +20,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by Accounts">
-                    <field name="sheet_id" select="1"/>
-                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="total" sum="Total"/>
-                    <field name="invoice_rate"/>
+                    <group col="4">
+                        <field name="sheet_id"/>
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="total" sum="Total"/>
+                        <field name="invoice_rate"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -60,7 +62,7 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Timesheet">
                 <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -68,18 +70,21 @@
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
-                <sheet string="Timesheet" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="user_id" invisible="1"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <newline/>
+                <sheet>
+                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <label for="date_from" class="oe_form_readonly_hidden" string="Timesheet Period"/>
+                    <h2>
+                        From <field name="date_from"/>
+                        to <field name="date_to"/>
+                    </h2>
+                    <group col="4">
                         <field name="name"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
                         <field name="department_id"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="user_id" invisible="1"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Daily">
                             <group col="6" colspan="4">
                                 <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 652bd464d86..ffcacb3a8f6 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -27,13 +27,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of ideas">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="parent_id" select="1"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
                         <field name="visibility"/>
                     </group>
-                    <separator string="Description" colspan="4"/>
-                    <field name="summary" colspan="4" nolabel="1"/>
+                    <separator string="Description"/>
+                    <field name="summary"/>
                 </form>
             </field>
         </record>
@@ -100,21 +100,6 @@
         <field name="value" eval="'ir.actions.act_window,'+str(action_idea_idea_categ_open)" />
     </record>
 
-<!-- Idea statistics Form View [where is python class for this view ?]-->
-
-    <!--<record model="ir.ui.view" id="view_idea_stat_form">-->
-    <!--    <field name="name">idea.stat.form</field>-->
-    <!--    <field name="model">idea.stat</field>-->
-    <!--    <field name="type">form</field>-->
-    <!--    <field name="arch" type="xml">-->
-    <!--        <form string="stat">-->
-    <!--            <field name="avgscore" />-->
-    <!--            <field name="nbr_comments" />-->
-    <!--            <field name="nbr_votes" />-->
-    <!--        </form>-->
-    <!--    </field>-->
-    <!--</record>-->
-
 <!--Vote For Idea Tree View -->
 
     <record model="ir.ui.view" id="view_idea_vote_tree">
@@ -139,14 +124,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
         <form string="Votes">
-            <group colspan="4">
-                <field name="user_id" select="1" />
+            <group col="4">
+                <field name="user_id"/>
                 <field name="date"/>
-                <newline/>
                 <field name="score"/>
             </group>
-            <separator string="Comments:" colspan="4"/>
-            <field name="comment" colspan="4" nolabel="1"/>
+            <separator string="Comments"/>
+            <field name="comment"/>
         </form>
         </field>
     </record>
@@ -182,27 +166,31 @@
         <field name="model">idea.idea</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
-            <header>
-                <button name="idea_open" string="Open" states="draft"/>
-                <button name="idea_close" string="Accept" states="open"/>
-                <button name="idea_cancel" string="Refuse" states="open" />
-                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-            </header>
-            <sheet string="New Idea" layout="auto">
-            <group col="6" colspan="4" class="oe_form_header">
-                <field name="name" select="1" />
-                <field name="category_id" select="1"/>
-                <field name="open_date" select="1"/>
+            <form string="Idea">
+                <header>
+                    <button name="idea_open" string="Open" states="draft"/>
+                    <button name="idea_close" string="Accept" states="open"/>
+                    <button name="idea_cancel" string="Refuse" states="open" />
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
+                </header>
+            <sheet>
+            <label for="name" class="oe_form_readonly_hidden"/>
+            <h1><field name="name"/></h1>
+            <label for="category_id"/>
+            <h2><field name="category_id"/></h2>
+
+            <group col="4">
+                <field name="open_date"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
                 <field name="visibility" invisible="1"/>
                 <field name="vote_avg" widget="progressbar"/>
-                <group col="4" colspan="2">
+                <label name="my_vote">
+                <div>
                     <field name="my_vote" readonly="1"/>
                     <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" states="open"  type="action" string="Submit Vote"/>
-                </group>
+                </div>
             </group>
-            <notebook colspan="4">
+            <notebook>
                 <page string="Idea Detail">
                     <field name="description" nolabel="1" colspan="4" widget="text_wiki"/>
                 </page>