From 746610f234c4b6839198abe472ded09f3ba96e0f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Jun 2012 23:56:28 +0200
Subject: [PATCH] [IMP] better form views

bzr revid: fp@tinyerp.com-20120609215628-0ro72kp0hzni67j9
---
 .../board/wizard/board_menu_create_view.xml   |  16 +-
 addons/mail/mail_message_view.xml             |   2 +-
 addons/mrp/mrp_view.xml                       |   6 +-
 addons/product/wizard/product_price_view.xml  |  12 +-
 addons/stock/board_warehouse_view.xml         |   2 +-
 addons/stock/report/report_stock_view.xml     |   8 +-
 addons/stock/res_config_view.xml              |  44 +-
 addons/stock/stock_view.xml                   | 614 +++++++++---------
 .../wizard/stock_change_product_qty_view.xml  |  21 +-
 .../stock_change_standard_price_view.xml      |  27 +-
 .../wizard/stock_fill_inventory_view.xml      |  31 +-
 .../stock_inventory_line_split_view.xml       |  94 ++-
 .../wizard/stock_inventory_merge_view.xml     |  53 +-
 .../wizard/stock_invoice_onshipping_view.xml  |  20 +-
 .../wizard/stock_location_product_view.xml    |  43 +-
 addons/stock/wizard/stock_move_view.xml       | 169 +++--
 .../stock/wizard/stock_partial_move_view.xml  |  36 +-
 .../wizard/stock_partial_picking_view.xml     |  42 +-
 .../wizard/stock_return_picking_view.xml      |  24 +-
 addons/stock/wizard/stock_splitinto_view.xml  |  16 +-
 addons/stock_location/stock_location_view.xml |  56 +-
 addons/stock_planning/stock_planning_view.xml |  28 +-
 .../stock_planning_create_periods_view.xml    |  21 +-
 .../stock_planning_createlines_view.xml       |  18 +-
 .../wizard/stock_planning_forecast_view.xml   |  18 +-
 addons/subscription/subscription_view.xml     |  75 +--
 addons/survey/survey_view.xml                 |   2 +-
 27 files changed, 764 insertions(+), 734 deletions(-)

diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 8961edc8a64..af71fa5a2eb 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <!--Board menu create wizard  -->
-    
+
         <record id="view_board_menu_create" model="ir.ui.view">
             <field name="name">board.menu.create.form</field>
             <field name="model">board.menu.create</field>
@@ -13,25 +13,25 @@
                     <header>
                         <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" />
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    <header>
-                    <group colspan="4" string="Menu Information"/>
+                    </header>
+                    <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
                         <field name="menu_parent_id"/>
                     </group>
                </form>
             </field>
         </record>
-        
+
   <!-- Action for Board Menu create wizard. -->
-  
+
         <record id="action_board_menu_create" model="ir.actions.act_window">
             <field name="name">Create Board Menu</field>
             <field name="res_model">board.menu.create</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_board_menu_create"/> 
+           <field name="view_id" ref="view_board_menu_create"/>
            <field name="target">new</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index bac65dc2682..1f7ec2297de 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -82,7 +82,7 @@
                     <label for="subject" class="oe_form_readonly_hidden"/>
                     <h1><field name="subject"/></h1>
                     <label for="user_id"/>
-                    <h2><field name="user_id" class="or_form_inline" string="User"/> on <field name="date" class="or_form_inline"/></h2>
+                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
                     <group col="4">
                         <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
                         <field name="type"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5ebf13d4895..82546d97dc7 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -322,9 +322,9 @@
                 <form string="Bill of Material" version="7.0">
                     <label for="product_id" class="oe_form_readonly_hidden"/>
                     <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="or_form_inline"/>: 
-                        <field name="product_qty" class="or_form_inline"/>
-                        <field name="product_uom" class="or_form_inline"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
+                        <field name="product_qty" class="oe_form_inline"/>
+                        <field name="product_uom" class="oe_form_inline"/>
                     </h1>
                     <label for="routing_id" class="oe_form_readonly_hidden"/>
                     <h2>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 365cbbeb0d7..5b966c6ca2c 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -13,14 +13,14 @@
                     <header>
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
-                    <header>
+                    </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
-                        <field name="qty1" colspan="2" />
-                        <field name="qty2" colspan="2" />
-                        <field name="qty3" colspan="2" />
-                        <field name="qty4" colspan="2" />
-                        <field name="qty5" colspan="2" />
+                        <field name="qty1"/>
+                        <field name="qty2"/>
+                        <field name="qty3"/>
+                        <field name="qty4"/>
+                        <field name="qty5"/>
                     </group>
                 </form>
               </field>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 38412228723..9fab20c9643 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -44,7 +44,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse board" layout="manual">
+                <form string="Warehouse board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 7d3fc6074f3..51236e47962 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -53,9 +53,11 @@
             <field name="model">report.stock.lines.date</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Dates of Inventories">
-                    <field name="product_id"/>
-                    <field name="date"/>
+                <form string="Dates of Inventories" version="7.0">
+                    <group>
+                        <field name="product_id"/>
+                        <field name="date"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 7d17d9eec50..de3e91ee183 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,34 +7,36 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Warehouse" layout="manual">
+                <form string="Configure Warehouse" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="group_stock_production_lot"/>
-                        <field name="module_product_expiry"
-                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                        <newline/>
-                        <field name="group_stock_tracking_lot"/>
+                    <sheet>
+                        <group col="4">
+                            <separator string="Traceability" colspan="4"/>
+                            <field name="group_stock_production_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                            <newline/>
+                            <field name="group_stock_tracking_lot"/>
 
-                        <separator string="Logistics" colspan="4"/>
-                        <field name="group_stock_multiple_locations"/>
-                        <field name="module_stock_location"/>
-                        <field name="module_stock_invoice_directly"/>
-                        <field name="decimal_precision"/>
+                            <separator string="Logistics" colspan="4"/>
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_location"/>
+                            <field name="module_stock_invoice_directly"/>
+                            <field name="decimal_precision"/>
 
-                        <separator string="Products" colspan="4"/>
-                        <field name="group_stock_packaging"/>
-                        <field name="group_stock_inventory_valuation"/>
-                        <field name="group_uom"/>
-                        <field name="group_uos"/>
-                        <field name="group_product_variant"/>
+                            <separator string="Products" colspan="4"/>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_stock_inventory_valuation"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
+                            <field name="group_product_variant"/>
 
-                        <separator string="Partners" colspan="4"/>
-                        <field name="module_claim_from_delivery"/>
+                            <separator string="Partners" colspan="4"/>
+                            <field name="module_claim_from_delivery"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d9c8ccd8f39..72679c51fbc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -56,15 +56,17 @@
             <field name="model">stock.inventory.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Inventory Lines">
-                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','&lt;&gt;','service')]"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom" groups="product.group_uom"/>
-                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                <form string="Stock Inventory Lines" version="7.0">
+                    <group col="4">
+                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','&lt;&gt;','service')]"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom" groups="product.group_uom"/>
+                        <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                        <field domain="[('usage','=','internal')]" name="location_id"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                            string="Split Inventory Line" groups="stock.group_inventory_valuation"
                             type="action" icon="terp-stock_effects-object-colorize"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -108,22 +110,27 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Physical Inventory" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Physical Inventory" layout="auto">
-                <group class="oe_form_header">
-                    <field name="name" placeholder="Annual invetory 2013"/>
-                    <field name="date"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <notebook colspan="4">
+                <sheet>
+                <group>
+                    <label for="name" clas="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" placeholder="Annual invetory 2013"/>
+                    </h1>
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook>
                     <page string="General Informations">
-                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
+                        <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
@@ -135,14 +142,13 @@
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
                                 <field name="state" invisible="True"/>
                             </tree>
-                            <form string="Products ">
-                                <field domain="[('usage','=','internal')]" name="location_id"/>
-                                <newline/>
-                                <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                <field name="product_qty"/>
-                                <field name="product_uom" groups="product.group_uom"/>
-                                <group colspan="2" col="4">
-                                <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                            <form string="Products" version="7.0">
+                                <group col="4">
+                                    <field domain="[('usage','=','internal')]" name="location_id"/>
+                                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="stock.group_inventory_valuation"
                                         type="action" icon="terp-stock_effects-object-colorize"/>
@@ -150,30 +156,30 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
-                             <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list" context="{'inventory_id':active_id}" >
-                                <tree string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                     <button name="%(track_line)d" string="Split in serial numbers" type="action"
-                                        icon="terp-stock_effects-object-colorize"
-                                        attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="draft,done,cancel"
-                                        context="{'inventory_id':parent.id}"
-                                        groups="stock.group_production_lot"/>
-                                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="stock.group_tracking_lot"
-                                        icon="terp-stock_effects-object-colorize"
-                                        context="{'inventory_id':parent.id}"
-                                        states="draft,done,cancel"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="date" string="Date"/>
-                                    <field name="state"  invisible="True"/>
-                                </tree>
-                             </field>
+                         <field name="move_ids" context="{'inventory_id':active_id}" >
+                            <tree string="Stock Moves">
+                                <field name="product_id"/>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                    icon="terp-stock_effects-object-colorize"
+                                    attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                                    states="draft,done,cancel"
+                                    context="{'inventory_id':parent.id}"
+                                    groups="stock.group_production_lot"/>
+                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                    groups="stock.group_tracking_lot"
+                                    icon="terp-stock_effects-object-colorize"
+                                    context="{'inventory_id':parent.id}"
+                                    states="draft,done,cancel"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="location_dest_id" groups="stock.group_locations"/>
+                                <field name="date" string="Date"/>
+                                <field name="state"  invisible="True"/>
+                            </tree>
+                         </field>
                     </page>
                     </notebook>
                     </group>
@@ -207,26 +213,22 @@
             <field name="model">stock.tracking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packs">
-                    <group col="2" colspan="2" groups="product.group_stock_packaging">
-                        <separator string="Pack Identification" colspan="2"/>
-                        <field name="name"/>
-                        <field name="serial"/>
-                        <field name="date"/>
-                        <field name="active"/>
+                <form string="Packs" version="7.0">
+                    <group>
+                        <group groups="product.group_stock_packaging" string="Pack Identification">
+                            <field name="name"/>
+                            <field name="serial"/>
+                            <field name="date"/>
+                            <field name="active"/>
+                        </group>
+                        <group groups="stock.group_tracking_lot" string="Traceability">
+                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+                                 colspan="2"/>
+                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                                context="{'type': 'move_history_ids'}" colspan="2"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2" groups="stock.group_tracking_lot">
-                        <separator string="Traceability" colspan="4"/>
-                        <button name="action_traceability" icon="gtk-go-up" string="Upstream traceability" type="object"
-                             colspan="2"/>
-                        <button name="action_traceability" icon="gtk-go-down" string="Downstream traceability" type="object"
-                            context="{'type': 'move_history_ids'}" colspan="2"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
@@ -291,15 +293,15 @@
             <field name="model">stock.production.lot.revision</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number Revisions">
-                    <field colspan="4" name="name"/>
-                    <field colspan="2" name="indice"/>
-                    <field colspan="2" name="date"/>
-                    <newline/>
-                    <field name="author_id" readonly="1"/>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Serial Number Revisions" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="indice"/>
+                        <field name="date"/>
+                        <field name="author_id"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -321,27 +323,27 @@
             <field name="model">stock.production.lot</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number">
-                    <group col="4" colspan="2">
-                        <separator string="Serial Number Identification" colspan="4"/>
-                        <field name="product_id" colspan="4"/>
-                        <field name="prefix" colspan="2"/>
-                        <field name="name" colspan="2"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="date" colspan="4"/>
+                <form string="Serial Number" version="7.0">
+                    <group>
+                        <group string="Serial Number Identification">
+                            <field name="product_id"/>
+                            <field name="prefix"/>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="date"/>
+                        </group>
+                        <group string="Traceability">
+                            <field name="stock_available"/>
+                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator string="Traceability" colspan="2"/>
-                        <field name="stock_available" colspan="2"/>
-                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Revisions">
-                            <field colspan="2" name="revisions" nolabel="1"/>
+                            <field name="revisions"/>
                         </page>
                         <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+                            <field name="move_ids">
                                 <tree  string="Stock Moves">
                                     <field name="picking_id" string="Reference"/>
                                     <field name="origin"/>
@@ -502,42 +504,40 @@
             <field name="model">stock.location</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Location">
-                    <group col="2" colspan="2">
-                        <separator string="Location" colspan="2"/>
-                        <field name="name"/>
-                        <field name="usage"/>
-                        <field name="location_id" groups="stock.group_locations"/>
+                <form string="Stock Location" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="location_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="location_id"/></h2>
+                    <group>
+                        <group string="Additional Information">
+                            <field name="usage"/>
+                            <field name="partner_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="icon"/>
+                            <field name="scrap_location"/>
+                            <field name="active"/>
+                        </group>
+                        <group string="Chained Locations">
+                            <field name="chained_location_type"/>
+                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                            <field name="chained_auto_packing"/>
+                            <field name="chained_delay"/>
+                            <field name="chained_journal_id"/>
+                            <field name="chained_picking_type"/>
+                            <field name="chained_company_id" widget="selection"/>
+                        </group>
+                        <group string="Localization">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
+                        </group><group string="Accounting Information">
+                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                        </group>
                     </group>
-                    <group col="4" colspan="2">
-                        <separator string="Additional Information" colspan="4"/>
-                        <field name="partner_id" colspan="4"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
-                        <field name="icon" colspan="4"/>
-                        <field name="scrap_location"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Chained Locations" colspan="2"/>
-                        <field name="chained_location_type"/>
-                        <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                        <field name="chained_auto_packing"/>
-                        <field name="chained_delay"/>
-                        <field name="chained_journal_id"/>
-                        <field name="chained_picking_type"/>
-                        <field name="chained_company_id" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Localization" colspan="2"/>
-                        <field name="posx"/>
-                        <field name="posy"/>
-                        <field name="posz"/>
-                        <separator string="Accounting Information" colspan="2"/>
-                        <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                        <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                    </group>
-                    <separator string="Additional Information" colspan="4"/>
-                    <field colspan="4" name="comment" nolabel="1"/>
+                    <separator string="Additional Information"/>
+                    <field name="comment"/>
                 </form>
             </field>
         </record>
@@ -620,14 +620,20 @@
             <field name="model">stock.warehouse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="lot_input_id"/>
-                    <field name="lot_stock_id"/>
-                    <field name="lot_output_id"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="partner_id"/>
+                <form string="Warehouse" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="lot_input_id"/>
+                            <field name="lot_stock_id"/>
+                            <field name="lot_output_id"/>
+                        </group>
+                        <group>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -704,7 +710,7 @@
             <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Internal Picking List" version="7.0">
                 <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
@@ -714,26 +720,33 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
-                <sheet string="Internal Picking List" layout="auto">
-                    <group colspan="4" col="6">
-                        <group colspan="4" col="4">
-                            <field name="name" readonly="1"/>
-                            <field name="origin" placeholder="PO0032"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
-                            <field name="invoice_state" string="Invoice Control"/>
+                <sheet>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" class="oe_form_inline"/>
+                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <field name="origin" placeholder="PO0032" class="oe_form_inline"/>
+                    </h1>
+                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="backorder_id" readonly="1"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="date"/>
-                            <field name="min_date" readonly="1"/>
+                            <field name="invoice_state" string="Invoice Control"/>
                             <field name="stock_journal_id" widget="selection"/>
                         </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="min_date" readonly="1"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id}">
+                            <field name="move_lines" context="{'address_in_id': partner_id}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -765,71 +778,82 @@
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
-                                    <group colspan="2" col="4">
-                                        <separator colspan="4" string="Move Information"/>
-                                        <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                        <button name="%(stock.move_scrap)d"
-                                                string="Scrap" type="action"
-                                                icon="gtk-convert" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
-                                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                                        <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        <field name="state" widget="statusbar"/>
+                                    <header>
+                                    <group>
+                                    <group string="Move Information">
+                                        <field name="name" invisible="1"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                        <label for="product_qty"/>
+                                        <div>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                    string="Scrap" type="action"
+                                                    icon="gtk-convert" context="{'scrap': True}"
+                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                        </div>
+                                        <label for="product_uos_qty" groups="product.group_uos"/>
+                                        <div>
+                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                        </div>
+                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
                                     </group>
 
-                                    <group colspan="2" col="2">
-                                        <separator string="Locations" colspan="2" />
+                                    <group string="Locations">
                                         <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
                                         <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                     </group>
 
-                                    <group colspan="2" col="2">
-                                        <separator string="Dates" colspan="2" />
+                                    <group string="Dates">
                                         <field name="create_date" invisible="1"/>
                                         <field name="date"/>
                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
-                                    <group colspan="2" col="4" groups="stock.group_tracking_lot">
-                                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot"  colspan="3"/>
-                                        <button name="%(split_into)d" string="New Pack" type="action"
-                                              groups="product.group_stock_packaging"
-                                              icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed"  colspan="1"/>
-                                        <field name="prodlot_id" groups="stock.group_production_lot"
-                                            context="{'location_id':location_id, 'product_id':product_id}"
-                                            domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"  colspan="3"/>
-                                        <button name="%(track_line)d"
-                                            groups="stock.group_tracking_lot"
-                                            states="draft,waiting,confirmed,assigned"
-                                            string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+                                    <group groups="stock.group_tracking_lot" string="Traceability">
+                                        <label for="tracking_id"/>
+                                        <div>
+                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                            <button name="%(split_into)d" string="New Pack" type="action"
+                                                  groups="product.group_stock_packaging"
+                                                  icon="terp-stock_effects-object-colorize"
+                                                  states="draft,assigned,confirmed"/>
+                                        </div>
+
+                                        <label for="prodlot_id"/>
+                                        <div>
+                                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                            <button name="%(track_line)d"
+                                                groups="stock.group_tracking_lot"
+                                                states="draft,waiting,confirmed,assigned"
+                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                        </div>
                                     </group>
-                                    <label string="" colspan="4"/>
-                                    <field name="state"/>
-                                    <group col="4" colspan="2">
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
                                     </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Additional info">
-                            <field name="auto_picking"/>
-                            <field name="date_done"/>
-                            <field name="move_type"/>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group col="4">
+                                <field name="auto_picking"/>
+                                <field name="date_done"/>
+                                <field name="move_type"/>
+                                <field name="type"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Quality test ok..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -1181,64 +1205,66 @@
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Stock Moves" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Stock Moves" layout="auto">
-                    <group colspan="4" col="7">
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
-                        <button name="%(stock.move_scrap)d"
-                                string="Scrap" type="action"
-                                icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" context="{'contact_display':'partner'}"/>
-
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
-                        <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
-                        <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" />
-                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                    </group>
-
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
-                              groups="product.group_stock_packaging"
-                              icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                <button name="%(stock.move_scrap)d"
+                                        string="Scrap" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                            </div>
+                            <field name="location_id" groups="stock.group_locations"/>
+                            <field name="location_dest_id" groups="stock.group_locations"/>
+                            <field name="partner_id" context="{'contact_display':'partner'}"/>
+                        </group>
+                        <group string="Move Information">
+                            <field name="name" string="Reason"/>
+                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
+                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        </group>
+                        <group string="Picking" >
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group string="Dates">
+                            <field name="create_date" groups="base.group_no_one" />
+                            <field name="date" groups="base.group_no_one" />
+                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                        </group>
+                        <group string="Traceability">
+                            <label for="tracking_id"/>
+                            <div>
+                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                <button name="%(split_into)d" string="New Pack" type="action"
+                                      groups="product.group_stock_packaging"
+                                      icon="terp-stock_effects-object-colorize"
+                                      states="draft,assigned,confirmed"/>
+                            </div>
+                            <label for="prodlot_id"/>
+                            <div>
+                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                    domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                                <button name="%(track_line)d"
+                                    groups="stock.group_tracking_lot"
+                                    states="draft,waiting,confirmed,assigned"
+                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -1364,7 +1390,7 @@
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Receive Products" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
@@ -1372,57 +1398,63 @@
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Receive Products" layout="auto">
-                    <group colspan="4" col="7">
+                <sheet>
+                <group>
+                    <group>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
-                        <button name="%(stock.move_scrap)d"
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                            <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
+                                states="draft,waiting,confirmed,assigned"/>
+                        </div>
+                        <label for="product_uos_qty"/>
+                        <div>
+                            <field name="product_uos_qty" groups="product.group_uos" class="oe_form_inline"
+                                on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                            <field name="product_uos" groups="product.group_uos"/>
+                        </div>
+                        <field name="name" string="Reason"/>
+                    </group><group>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
                         <field name="partner_id"/>
-
                     </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
-                        <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
+                    <group>
                         <field name="picking_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
+                    <group>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
+                    <group>
+                        <label name="tracking_id"/>
+                        <div>
+                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                            <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed,done" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned,done"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                        </div>
+                        <label name="prodlot_id"/>
+                        <div>
+                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                            <button name="%(track_line)d"
+                                  groups="stock.group_tracking_lot" class="oe_form_inline"
+                                  states="draft,waiting,confirmed,assigned,done"
+                                  string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                        </div>
                     </group>
+                </group>
                 </sheet>
                 </form>
             </field>
@@ -1535,10 +1567,12 @@
             <field name="model">stock.incoterms</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Incoterms">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="Incoterms" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -1681,9 +1715,11 @@
             <field name="model">stock.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Journal">
-                    <field name="name"/>
-                    <field name="user_id"/>
+                <form string="Stock Journal" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 6bedd7605e6..6527bffd586 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -6,19 +6,16 @@
             <field name="model">stock.change.product.qty</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Change Product Quantity">
-                    <separator string="Select Quantity" colspan="4"/>
-                    <newline/>
-                    <field name="new_quantity" />
-                    <newline/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="location_id" />
-                    <field name="prodlot_id" />
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <form string="Change Product Quantity" version="7.0">
+                    <header>
                         <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <group string="Select Quantity">
+                        <field name="new_quantity" />
+                        <field name="product_id" invisible="1"/>
+                        <field name="location_id" />
+                        <field name="prodlot_id" />
                     </group>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index b46829b1a0a..e5b47570854 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-   		<record id="view_change_standard_price" model="ir.ui.view">
+        <record id="view_change_standard_price" model="ir.ui.view">
             <field name="name">Change Standard Price</field>
             <field name="model">stock.change.standard.price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Change Standard Price">
-                    <separator string="Change Price" colspan="4"/>
-                    <newline/>
-             		<field name="new_price" string="Cost Price"/>              		
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-              		<group col="2" colspan="2">                        
-	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
-              		</group>
+              <form string="Change Standard Price" version="7.0">
+                  <header>
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
+                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                  <header>
+                  <separator string="Change Price"/>
+                  <group>
+                      <field name="new_price" string="Cost Price"/>
+                  </group>
               </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_view_change_standard_price" model="ir.actions.act_window">
+        <record id="action_view_change_standard_price" model="ir.actions.act_window">
             <field name="name">Change Standard Price</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.change.standard.price</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_change_standard_price"/>
-            <field name="target">new</field>            
+            <field name="target">new</field>
         </record>
 
     </data>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index c97a662c846..527b0de2e9a 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -6,28 +6,29 @@
             <field name="model">stock.fill.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Import Inventory">
-                     <separator string="Import current product inventory from the following location" colspan="4" />
-                    <field name="location_id"/>
-                    <newline/>
-                    <field name="recursive"/>
-                    <newline/>
-                    <field name="set_stock_zero"/>
-                    <separator string="" colspan="4" />
-                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
-             </form>
+              <form string="Import Inventory" version="7.0">
+                  <header>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
+                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                  </header>
+                  <separator string="Import current product inventory from the following location"/>
+                  <group>
+                      <field name="location_id"/>
+                      <field name="recursive"/>
+                      <field name="set_stock_zero"/>
+                  </group>
+              </form>
             </field>
         </record>
 
-         <act_window name="Import Inventory"            
+         <act_window name="Import Inventory"
             res_model="stock.fill.inventory"
             src_model="stock.inventory"
             view_mode="form"
             target="new"
-            context="{'search_default_in_location':1}" 
-            key2="client_action_multi"    
-            id="action_view_stock_fill_inventory"/>    
+            context="{'search_default_in_location':1}"
+            key2="client_action_multi"
+            id="action_view_stock_fill_inventory"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fc188184c42..e8b31d94541 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -2,68 +2,60 @@
 <openerp>
     <data>
         <record id="view_split_in_lots_inherit" model="ir.ui.view">
-	        <field name="name">Split Inventory Line</field>
-	        <field name="model">stock.inventory.line.split</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-                <form string="Split in lots">
-                    <group width="660" height="275">
+            <field name="name">Split Inventory Line</field>
+            <field name="model">stock.inventory.line.split</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Split in Lots" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <group>
                         <field name="product_id" colspan="4" readonly="1"/>
-                        <newline/>
-						<group colspan="4" col="4">
-						    <group colspan="1" col="2">
-						        <field name="use_exist"/>
-						    </group>
-							<group colspan="1" col="2">
-							    <field name="qty" readonly="1"/>
-							</group>
-							<group colspan="1" col="2">
-							    <field name="product_uom" readonly="1"/>
-							</group>
-	                    </group>
-	                    <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
-	                        <field name="line_ids" colspan="4" nolabel="1">
-	                            <tree string="Lots Number" editable="bottom">
-	                                <field name="name" string="Lots"/>
-	                                <field name="quantity" />
-	                            </tree>
-	                            <form string="Lots Number">
-	                                <field name="name" string="Lots"/>
-	                                <field name="quantity" />
-	                            </form>
-	                        </field>
-	                    </group>
-	                    <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
-	                        <field name="line_exist_ids" colspan="4" nolabel="1">
-	                            <tree string="Lots Number" editable="bottom">
-	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
-	                                <field name="quantity" />
-	                            </tree>
-	                            <form string="Lots Number">
-	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
-	                                <field name="quantity" />
-	                            </form>
-	                        </field>
-	                    </group>
-	                    <separator string="" colspan="4" />
-	                    <label string="" colspan="2" />
-	                    <button icon='gtk-cancel' special="cancel"
-	                        string="Cancel" />
-	                    <button name="split_lot" string="Ok"
-	                        type="object" icon="gtk-ok" />
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" readonly="1"/>
+                            <field name="product_uom" readonly="1"/>
+                        </div>
+                        <field name="use_exist"/>
                     </group>
+                    <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
+                        <tree string="Lots Number" editable="bottom">
+                            <field name="name" string="Lots"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Lots Number" version="7.0">
+                            <group>
+                                <field name="name" string="Lots"/>
+                                <field name="quantity" />
+                            </group>
+                        </form>
+                    </field>
+                    <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
+                        <tree string="Lots Number" editable="bottom">
+                            <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Lots Number" version="7.0">
+                            <group>
+                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+                                <field name="quantity" />
+                            </group>
+                        </form>
+                    </field>
                 </form>
             </field>
         </record> 
-		
-		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
+        
+        <record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
             <field name="name">Split inventory lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory.line.split</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index d9c1dd58b9a..383f47315bf 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	
-		<record id="name_form" model="ir.ui.view">
-		        <field name="name">stock.inventory.merge.form</field>
-		        <field name="model">stock.inventory.merge</field>
-		        <field name="type">form</field>
-		        <field name="arch" type="xml">
-					<form string="Merge Inventories">
-				    	<separator colspan="4" string="Merge Inventories" />
-				    	<label string="Do you want to merge theses inventories?"/>
-				 <separator colspan="4"/>
-    				<group colspan="4" col="6">
-					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
-					</group>			
-				</form>
-			</field>
-		</record>
-		 <act_window name="Merge inventories"		    
-			res_model="stock.inventory.merge"
-			src_model="stock.inventory"
-			view_mode="form"
+    <data>
+
+        <record id="name_form" model="ir.ui.view">
+            <field name="name">stock.inventory.merge.form</field>
+            <field name="model">stock.inventory.merge</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Inventories" version="7.0">
+                    <header>
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
+                        <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                    <header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                </form>
+            </field>
+        </record>
+        <act_window name="Merge inventories"
+            res_model="stock.inventory.merge"
+            src_model="stock.inventory"
+            view_mode="form"
                         multi="True"
-			target="new"        
-			key2="client_action_multi"    
-			id="action_view_stock_merge_inventories"/>	
-		
-	</data>
+            target="new"
+            key2="client_action_multi"
+            id="action_view_stock_merge_inventories"/>
+
+    </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 5095a40fa50..ba158bba1e4 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -6,16 +6,16 @@
             <field name="model">stock.invoice.onshipping</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create invoice">
-                    <separator colspan="4" string="Create Invoice" />
-                    <field name="journal_id"/>
-                    <newline/>
-                    <field name="group"/>
-                    <newline/>
-                    <field name="invoice_date" />
-                    <separator string="" colspan="4" />
-                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+              <form string="Create invoice" version="7.0">
+                  <header>
+                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                  </header>
+                  <group string="Create Invoice">
+                      <field name="journal_id"/>
+                      <field name="group"/>
+                      <field name="invoice_date" />
+                  </group>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 2459daac189..09ac798ea1c 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_stock_location_product" model="ir.ui.view">
+        <record id="view_stock_location_product" model="ir.ui.view">
             <field name="name">Products by Location</field>
             <field name="model">stock.location.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="View Stock of Products">
-        			<separator string="Stock Location Analysis" colspan="4"/>
-       				<field name="from_date" colspan="4"/>
-       				<newline/>
-       				<field name="to_date" colspan="4"/>
-       				<newline/>
-       				<label string=""/>
-       				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
-        			<separator string="" colspan="4" />
-        			<label string=""/>
-					<button special="cancel" string="_Cancel" icon="gtk-cancel" />
-           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
-    			</form>
+               <form string="View Stock of Products" version="7.0">
+                    <header>
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel" />
+                    </header>
+                    <separator string="Stock Location Analysis"/>
+                    <group>
+                        <field name="from_date"/>
+                        <field name="to_date"/>
+                    </group>
+                    <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
+                </form>
             </field>
-		</record>
+        </record>
 
 
-        <act_window name="Products by Location"		    
-		    res_model="stock.location.product"
-		    src_model="stock.location"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_stock_location_product"/>			
+        <act_window name="Products by Location"
+            res_model="stock.location.product"
+            src_model="stock.location"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_view_stock_location_product"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 577411e3c09..95b314136f2 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,21 +8,21 @@
             <field name="model">stock.move.consume</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Consume Move">
-                    <separator string="Consume Products" colspan="4"/>
-                    <field name="product_id" colspan="4" readonly="1"/>
-                    <field name="location_id" colspan="4" />
-                    <field name="product_qty" colspan="2"/>
-                    <field name="product_uom" nolabel="1" readonly="1"/>
-                    <newline/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <group col="2" colspan="1">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="do_move_consume" string="Ok"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                <form string="Consume Move" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" />
+                    <header>
+                    <separator string="Consume Products"/>
+                    <div>
+                        <field name="product_id" readonly="1"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty"/>
+                            <field name="product_uom" nolabel="1" readonly="1"/>
+                        </div>
+                        <field name="location_id"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -41,20 +41,20 @@
             <field name="model">stock.move.scrap</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scrap Move">
-                    <separator string="Scrap Products" colspan="4"/>
-                    <field name="product_id" colspan="4" readonly="1"/>
-                    <field name="location_id" colspan="4" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
-                    <field name="product_qty" colspan="2"/>
-                    <field name="product_uom" nolabel="1" readonly="1"/>
-                    <newline/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <group col="2" colspan="1">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="move_scrap" string="Ok"
-                            colspan="1" type="object" icon="gtk-ok" />
+                <form string="Scrap Move" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" />
+                    <header>
+                    <separator string="Scrap Products"/>
+                    <group>
+                        <field name="product_id"  readonly="1"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" class="oe_form_inline"/>
+                            <field name="product_uom" class="oe_form_inline" readonly="1"/>
+                        </div>
+                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
                 </form>
             </field>
@@ -70,70 +70,61 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-	            <field name="name">Split in lots</field>
-	            <field name="model">stock.move.split</field>
-	            <field name="type">form</field>
-	            <field name="arch" type="xml">
-				<form string="Split in lots">
-				<group width="660" height="275">
-                  <field name="product_id" colspan="4" readonly="1"/>
-                  <newline/>
-                  <group colspan="4" col="4">
-                      <group colspan="1" col="2">
-                          <field name="use_exist"/>
-                      </group>
-                      <group colspan="1" col="2">
-                          <field name="qty" readonly="1"/>
-                       </group>
-                      <group colspan="1" col="2">
-                          <field name="product_uom" readonly="1"/>
-                      </group>
-                  </group>
-                  <field name="location_id" invisible="1"/>
-
-                  <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
-                        <field name="line_ids" colspan="4" nolabel="1">
-                            <tree string="Serial Numbers" editable="bottom">
-                                <field name="name" string="Lots"/>
-                                <field name="quantity" />
-                            </tree>
-                            <form string="Serial Number">
+                <field name="name">Split in lots</field>
+                <field name="model">stock.move.split</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                <form string="Split in Lots" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <group>
+                        <field name="product_id" readonly="1"/>
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" readonly="1" class="oe_form_inline"/>
+                            <field name="product_uom" readonly="1" class="oe_form_inline"/>
+                        </div>
+                        <field name="location_id" invisible="1"/>
+                        <field name="use_exist"/>
+                    </group>
+                    <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
+                        <tree string="Serial Numbers" editable="bottom">
+                            <field name="name" string="Lots"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Serial Number" version="7.0">
+                            <group>
                                 <field name="name" string="Lot number"/>
                                 <field name="quantity" />
-                            </form>
-                        </field>
-                    </group>
-                  <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
-                        <field name="line_exist_ids" colspan="4" nolabel="1">
-                            <tree string="Serial Numbers" editable="bottom">
+                            </group>
+                        </form>
+                    </field>
+                    <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
+                        <tree string="Serial Numbers" editable="bottom">
+                            <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
+                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                        </tree>
+                        <form string="Serial Number" version="7.0">
+                            <group>
                                 <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
                                 <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
-                            </tree>
-                            <form string="Serial Number">
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
-                            </form>
-                        </field>
-                    </group>
-	                	<separator string="" colspan="4" />
-	                	<label string="" colspan="2" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="split_lot" string="Ok"
-	                		type="object" icon="gtk-ok" />
-					</group>
-	                </form>
-	            </field>
-	        </record>
+                            </group>
+                        </form>
+                    </field>
+                </form>
+                </field>
+            </record>
 
-	        <record id="track_line" model="ir.actions.act_window">
-	            <field name="name">Split in lots</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">stock.move.split</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">form</field>
-	            <field name="target">new</field>
-	        </record>
+            <record id="track_line" model="ir.actions.act_window">
+                <field name="name">Split in lots</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">stock.move.split</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">form</field>
+                <field name="target">new</field>
+            </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 12b20f0d1aa..bc255163009 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -20,15 +20,13 @@
             <field name="model">stock.partial.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <separator colspan="4" string="Products"/>
-                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
+                <form version="7.0">
+                    <header>
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" />
                         <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="do_partial" string="_Validate" colspan="1" type="object" icon="gtk-go-forward" />
-                    </group>
+                    <header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
@@ -57,16 +55,18 @@
             <field name="model">stock.partial.move.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="location_id" />
-                    <field name="location_dest_id" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
-                    <field name="update_cost" invisible="1"/>
-                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                <form version="7.0">
+                    <group>
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="product_uom" />
+                        <field name="location_id" />
+                        <field name="location_dest_id" />
+                        <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
+                        <field name="update_cost" invisible="1"/>
+                        <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c57c6c400e4..4febaa516c1 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -15,10 +15,14 @@
             <field name="model">stock.partial.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="hide_tracking" invisible="1"/>
-                    <separator colspan="4" string="Transfer Products" name="product_separator"/>
-                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" context="{'hide_tracking': hide_tracking}">
+                <form version="7.0">
+                    <header>
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" />
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <field name="hide_tracking" invisible="1"/>
+                    <header>
+                    <separator string="Transfer Products" name="product_separator"/>
+                    <field name="move_ids" context="{'hide_tracking': hide_tracking}">
                         <tree editable="bottom" string="Product Moves">
                             <field name="product_id" />
                             <field name="quantity" />
@@ -31,12 +35,6 @@
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="do_partial" string="_Transfer" colspan="1" type="object" icon="gtk-go-forward" />
-                    </group>
                 </form>
             </field>
         </record>
@@ -64,17 +62,19 @@
             <field name="model">stock.partial.picking.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="location_id" />
-                    <field name="location_dest_id" />
-                    <field name="tracking" invisible="1"/>
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
-                    <field name="update_cost" invisible="1"/>
-                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                <form version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="product_uom" />
+                        <field name="location_id" />
+                        <field name="location_dest_id" />
+                        <field name="tracking" invisible="1"/>
+                        <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
+                        <field name="update_cost" invisible="1"/>
+                        <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 7735801624d..766b5244019 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -44,9 +44,11 @@
             <field name="model">stock.return.picking.memory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
+                <form version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                    </group>
                  </form>
             </field>
         </record>   
@@ -56,15 +58,15 @@
             <field name="model">stock.return.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Return lines">
-                    <label string="Provide the quantities of the returned products." colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <field name="product_return_moves"  nolabel="1" colspan="6"/>
-                    <field name="invoice_state" />
-                    <separator string="" colspan="4" />
-                    <group col="2" colspan="4">
+                <form string="Return lines" version="7.0">
+                    <header>
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" />
                         <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                        <button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />
+                    <header>
+                    <label string="Provide the quantities of the returned products."/>
+                    <group>
+                        <field name="product_return_moves"/>
+                        <field name="invoice_state" />
                     </group>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 131511d0b10..35329230aee 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -6,13 +6,15 @@
             <field name="model">stock.split.into</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Split Move">
-                <separator string="Quantity to Leave in the Current Pack" colspan="4"/>
-                <field name="quantity"/>
-                <button icon='gtk-cancel' special="cancel"
-                    string="_Cancel" />
-                <button name="split" string="Ok"
-                    type="object" icon="gtk-ok" />
+            <form string="Split Move" version="7.0">
+                <header>
+                    <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" />
+                </header>
+                <separator string="Quantity to Leave in the Current Pack"/>
+                <group>
+                    <field name="quantity"/>
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 5f2bacd565f..b37c18cc876 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -20,15 +20,17 @@
             <field name="model">stock.location.path</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Location Paths">
-                    <field name="name"/>
-                    <newline/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="location_from_id"/>
-                    <field name="location_dest_id"/>
-                    <field name="auto"/>
-                    <field name="delay"/>
+                <form string="Location Paths" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <newline/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="location_from_id"/>
+                        <field name="location_dest_id"/>
+                        <field name="auto"/>
+                        <field name="delay"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -49,16 +51,18 @@
                                 <field name="journal_id"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pulled Paths">
-                                <separator string="Conditions" colspan="4"/>
-                                <field name="name" colspan="4" placeholder="Fulfill needs on location X from location Y "/>
-                                <field name="location_id"/>
-                                <separator string="Action Type" colspan="4"/>
-                                <field name="type_proc"/>
-                                <separator string="Parameters" colspan="4"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <newline/>
-                                <group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
+                            <form string="Pulled Paths" version="7.0">
+                                <group>
+                                    <group string="Conditions">
+                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
+                                        <field name="location_id"/>
+                                    </group>
+                                    <group string="Action Type">
+                                        <field name="type_proc"/>
+                                        <field name="company_id"/>
+                                    </group>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('type_proc','!=','move')]}">
                                     <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                     <field name="picking_type"/>
                                     <field name="partner_address_id"/>
@@ -69,7 +73,7 @@
                                 </group>
                             </form>
                         </field>
-                        <field name="path_ids" colspan="4" nolabel="1">
+                        <field name="path_ids">
                         <field name="name"/>
                             <tree string="Pushed flows">
                                 <field name="location_from_id"/>
@@ -79,18 +83,18 @@
                                 <field name="invoice_state"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pushed flows">
-                                <group colspan="4" col="6">
+                            <form string="Pushed flows" version="7.0">
+                                <group col="4">
                                     <field name="name" placeholder="When receiving at location X, move to location Y"/>
                                     <field name="location_from_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="auto"/>
                                     <field name="delay"/>
                                     <field name="journal_id"/>
+                                    <field name="picking_type"/>
+                                    <field name="invoice_state"/>
+                                    <field name="company_id" groups="base.group_multi_company"/>
                                 </group>
-                                <field name="picking_type"/>
-                                <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
                             </form>
                         </field>
                     </page>
@@ -99,5 +103,3 @@
        </record>
     </data>
 </openerp>
-
-   
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 1b5cd953027..97f1028b59f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -12,20 +12,20 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
-                <header>
-                    <button name="button_open" string="Open" states="draft" type="object"/>
-                    <button name="button_close" string="Close" states="open" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </header>
-                <sheet string="Stock Periods" layout="auto">
-                    <group class="oe_form_header">
-                        <field name="name" colspan="2"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
-                </sheet>
+                <form>
+                    <header>
+                        <button name="button_open" string="Open" states="draft" type="object"/>
+                        <button name="button_close" string="Close" states="open" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                    </header>
+                    <sheet string="Stock Periods">
+                        <group col="4">
+                            <field name="name"/>
+                            <newline/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index c2658a7b5a5..081ea4c25b0 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -8,15 +8,16 @@
             <field name="model">stock.period.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <separator colspan="4" string=""/>
-                    <group col="4" colspan="4">
+                <form string="Stock Periods" version="7.0">
+                    <header>
                         <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
                         <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
+                    <header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
                     </group>
                 </form>
             </field>
@@ -28,14 +29,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_stock_period_createlines_form"/>
-           <field name="help">This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually.</field>
+            <field name="help">This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually.</field>
             <field name="target">new</field>
         </record>
 
         <menuitem id="menu_stock_period_creatlines"
-                  name="Create Stock Periods"
-                  parent="stock.menu_stock_configuration"
-                  action="action_stock_period_createlines_form"
-                  sequence = "20"/>
+            name="Create Stock Periods"
+            parent="stock.menu_stock_configuration"
+            action="action_stock_period_createlines_form"
+            sequence = "20"/>
     </data>
 </openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index b0da05b24ab..f9888b32096 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -7,15 +7,17 @@
             <field name="model">stock.planning.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Stock Planning Lines">
-                    <field name="period_id" widget="selection"/>
-                    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                    <field name="forecasted_products"/>
-                    <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
-                    <group colspan="4">
+                <form string="Create Stock Planning Lines" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
+                    <header>
+                    <group col="4">
+                        <field name="period_id" widget="selection"/>
+                        <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                        <field name="forecasted_products"/>
+                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
                 </form>
             </field>
@@ -35,6 +37,6 @@
         <menuitem
             id="menu_stock_planning_createlines"
             parent="menu_stock_planning_manual"
-            action="action_stock_planning_createlines_form" sequence = "5"/>
+            action="action_stock_planning_createlines_form" sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 4df396b73f2..7d496f35935 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -8,15 +8,17 @@
             <field name="model">stock.sale.forecast.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Forecasts Lines">
-                    <field name="period_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                    <field name="copy_forecast"/>
-                    <field name="product_categ_id" widget="selection"/>
-                    <group colspan="4">
-                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                <form string="Create Forecasts Lines" version="7.0">
+                    <header>
                         <button icon="gtk-execute" name="create_forecast" string="Create" type="object" />
+                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                    <header>
+                    <group col="4">
+                        <field name="period_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                        <field name="copy_forecast"/>
+                        <field name="product_categ_id" widget="selection"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b4c992dcbc4..c2cffdc1bfa 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -13,40 +13,39 @@
             <field name="model">subscription.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Subscriptions" version="7.0">
                 <header>
                     <button name="set_process" states="draft" string="Process" type="object"/>
                     <button name="set_done" states="running" string="Stop" type="object"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
-                <sheet string="Subscriptions" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="active" select="1"/>
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="active"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Subsription Data">
-                            <newline/>
-                            <field name="interval_number"/>
-                            <field name="interval_type"/>
-                            <field name="exec_init"/>
-                            <field name="date_init"/>
-                            <field colspan="4" name="doc_source" widget="reference"/>
-                            <separator string="Notes"  colspan="4"/>
-                            <field colspan="4" name="notes" nolabel="1"/>
-                            <separator colspan="4"/>
-                            <field colspan="4" name="cron_id" readonly="1"/>
+                            <group col="4">
+                                <field name="interval_number"/>
+                                <field name="interval_type"/>
+                                <field name="exec_init"/>
+                                <field name="date_init"/>
+                                <field name="doc_source" widget="reference"/>
+                                <field name="cron_id"/>
+                            </group>
+                            <separator string="Notes"/>
+                            <field name="notes"/>
                         </page>
                         <page string="Documents created">
-                            <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
+                            <field name="doc_lines" widget="one2many_list"/>
                         </page>
                         <page string="Notes">
-                            <separator string="Notes" colspan="4"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                    </page>
+                            <field name="note"/>
+                        </page>
                     </notebook>
                     </sheet>
                 </form>
@@ -62,7 +61,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="active"/>
-                    <field name="user_id" select="1"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -125,9 +124,11 @@
             <field name="model">subscription.subscription.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription History">
-                    <field name="date"/>
-                    <field colspan="4" name="document_id"/>
+                <form string="Subscription History" version="7.0">
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="document_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -137,14 +138,13 @@
             <field name="model">subscription.document</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Document">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="model" select="1"/>
-                        <field name="active" select="1"/>
+                <form string="Subscription Document" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model"/>
+                        <field name="active"/>
                     </group>
-                    <newline/>
-                    <field colspan="4" name="field_ids" nolabel="1"/>
+                    <field name="field_ids"/>
                 </form>
             </field>
         </record>
@@ -181,10 +181,11 @@
             <field name="model">subscription.document.fields</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Document Fields">
-                    <field name="field" select="1"/>
-                    <newline/>
-                    <field name="value"/>
+                <form string="Subscription Document Fields" version="7.0">
+                    <group>
+                        <field name="field"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 96dc60ff447..4b44b4f56b9 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,7 +18,7 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form>
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>