diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index c3cc21ce893..49ec0f44909 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing board" layout="manual">
+                <form string="Manufacturing board" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 236b6660405..5ebf13d4895 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -23,11 +23,11 @@
             <field name="model">mrp.property.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="Property Group"/>
-                    <field colspan="4" name="name" select="1" nolabel="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Properties categories" version="7.0">
+                    <label for="name"/>
+                    <field name="name"/>
+                    <label name="description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -63,12 +63,14 @@
             <field name="model">mrp.property</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="composition" select="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Properties" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <field name="group_id"/>
+                        <field name="composition"/>
+                    </group>
+                    <label for="description">
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -140,37 +142,36 @@
             <field name="model">mrp.workcenter</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Work Center">
+                <form string="Work Center" version="7.0">
                     <group col="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="active"/>
                         <field name="resource_type"/>
                         <field name="calendar_id" widget="selection"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook>
                         <page string="General Information">
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Capacity Information"/>
-                            <field name="time_efficiency"/>
-                            <field name="capacity_per_cycle"/>
-                            <field name="time_cycle" widget="float_time"/>
-                            <field name="time_start" widget="float_time"/>
-                            <field name="time_stop" widget="float_time"/>
+                            <group>
+                            <group string="Capacity Information">
+                                <field name="time_efficiency"/>
+                                <field name="capacity_per_cycle"/>
+                                <field name="time_cycle" widget="float_time"/>
+                                <field name="time_start" widget="float_time"/>
+                                <field name="time_stop" widget="float_time"/>
                             </group>
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Costing Information"/>
-                            <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                            <field name="costs_hour"/>
-                            <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_cycle"/>
-                            <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                            <group string="Costing Information">
+                                <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                <field name="costs_hour"/>
+                                <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                <field name="costs_cycle"/>
+                                <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
                             </group>
-                            <separator colspan="4" string="Description"/>
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <label for="note"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -227,16 +228,17 @@
             <field name="model">mrp.routing.workcenter</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Routing Work Centers">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="sequence" select="1"/>
-                    <field name="workcenter_id"/>
-                    <field name="cycle_nbr"/>
-                    <field name="hour_nbr" widget="float_time"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="note" nolabel="1"/>
+                <form string="Routing Work Centers" version="7.0">
+                    <group col="4" string="General Information">
+                        <field colspan="4" name="name"/>
+                        <field name="sequence"/>
+                        <field name="workcenter_id"/>
+                        <field name="cycle_nbr"/>
+                        <field name="hour_nbr" widget="float_time"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <label for="note"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -246,20 +248,20 @@
             <field name="model">mrp.routing</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Routing">
-                    <group colspan="4" col="6">
+                <form string="Routing" version="7.0">
+                    <group col="4">
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
                         <field name="location_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Work Center Operations">
-                           <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
+                           <field name="workcenter_lines"/>
                         </page>
                         <page string="Notes">
-                           <field colspan="4" name="note" nolabel="1"/>
+                           <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -317,99 +319,59 @@
             <field name="model">mrp.bom</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bill of Material">
-                    <group colspan="4" col="6">
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1" string="Reference"/>
-                        <newline/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                <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"/>
+                    </h1>
+                    <label for="routing_id" class="oe_form_readonly_hidden"/>
+                    <h2>
                         <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                        <newline/>
-                        <field name="product_uos_qty" groups="product.group_uos" />
-                        <field name="product_uos"  groups="product.group_uos"/>
-                        <newline/>
-                        <field name="type"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="code" string="Reference"/>
+                        </group>
+                        <group>
+                            <field name="type"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="product_uos_qty" groups="product.group_uos" />
+                            <field name="product_uos"  groups="product.group_uos"/>
+                        </group>
                     </group>
-                    <notebook colspan="4" >
+                    <notebook>
                         <page string="Components">
-                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
+                            <field name="bom_lines" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                 </tree>
-                                <form string="Bill of Material">
-                                    <group colspan="4" col="6">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                    <field name="name" select="1"/>
-                                    <field name="code" select="1" string="Reference"/>
-                                    <newline/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"/>
-                                    <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                                    <newline/>
-                                    <field name="product_uos_qty" groups="product.group_uos" />
-                                    <field name="product_uos"  groups="product.group_uos"/>
-                                    <newline/>
-                                    <field name="type"/>
-                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                                <group>
-                                <notebook colspan="4">
-                                    <page string="Components">
-                                        <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
-                                            <tree string="Components" editable="bottom">
-                                                <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                                <field name="product_qty"/>
-                                                <field name="product_uom"/>
-                                                <field name="name" invisible="1"/>
-                                                <field name="date_start"/>
-                                                <field name="date_stop"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                                        <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
-                                    </page>
-                                    <page string="Properties" groups="product.group_mrp_properties">
-                                        <field name="position"/>
-                                        <field name="active"/>
-                                        <field name="sequence"/>
-                                        <field name="bom_id"/>
-
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                        <field name="product_rounding"/>
-                                        <field name="product_efficiency"/>
-                                        <field colspan="4" name="property_ids" nolabel="2"/>
-                                    </page>
-                                </notebook>
-                                </group>
-                            </form>
                             </field>
                         </page>
                         <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
+                            <field name="revision_ids"/>
                         </page>
                         <page string="Properties" groups="product.group_mrp_properties">
-                            <field name="position"/>
-                            <field name="active"/>
-                            <field name="sequence"/>
-                            <field name="bom_id"/>
+                            <group col="4">
+                                <field name="position"/>
+                                <field name="active"/>
+                                <field name="sequence"/>
+                                <field name="bom_id"/>
 
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                            <field name="product_rounding"/>
-                            <field name="product_efficiency"/>
-                            <separator string="Properties" colspan="4"/>
-                            <newline/>
-                            <field colspan="4" name="property_ids" nolabel="1"/>
+                                <field name="date_start"/>
+                                <field name="date_stop"/>
+                                <field name="product_rounding"/>
+                                <field name="product_efficiency"/>
+                            </group>
+                            <separator string="Properties"/>
+                            <field name="property_ids"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -552,13 +514,15 @@
             <field name="model">mrp.bom.revision</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="BoM Revisions">
-                    <field colspan="4" name="name"/>
-                    <field colspan="1" name="indice"/>
-                    <field colspan="1" name="date"/>
-                    <field name="author_id" readonly="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="BoM Revisions" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="indice"/>
+                        <field name="date"/>
+                        <field name="author_id" readonly="1"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -631,7 +595,7 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Manufacturing Orders" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Confirm Production"/>
                     <button name="button_produce" states="ready" string="Start Production"/>
@@ -642,61 +606,66 @@
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Manufacturing Orders" layout="auto">
-                    <group colspan="4" col="7">
-                        <field name="name" string="Reference"/>
-                        <field name="date_planned"/>
-                        <field name="origin"/>
-                        <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                <sheet>
+                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_form_inline"/>
+                        <field name="product_qty" class="oe_form_inline"/>
+                        <field name="product_uom" class="oe_form_inline"/>
                         <button type="action"
-                            icon="terp-accessories-archiver+"
+                            icon="terp-accessories-archiver+" class="oe_form_inline"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
+                    </h1>
+                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="date_planned"/>
+                            <field name="origin"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="product_uos_qty" groups="product.group_uos"/>
+                            <field name="product_uos" groups="product.group_uos"/>
+                        </group>
                     </group>
-                    <group colspan="4" col="4">
-                        <label string="" colspan="2"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                        <field name="user_id"/>
-                    </group>
-
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Consumed Products">
-                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="mrp.group_mrp_routings" select="1"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                            <separator string="" colspan="4"/>
-
-                            <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
-                                mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="Unit of Measure"/>
-                                    <field name="location_id"  string="Source Loc."/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in Serial Numbers"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="draft,waiting,confirmed,assigned" />
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                </tree>
-                            </field>
-
-                            <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                                       widget="one2many_list" mode="tree,form" height="275">
+                            <group col="4">
+                                <group>
+                                    <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                                    <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                </group>
+                                <group>
+                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                </group>
+                                <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                                    <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                        <field name="product_id" />
+                                        <field name="product_qty"  string="Qty"/>
+                                        <field name="product_uom"  string="Unit of Measure"/>
+                                        <field name="location_id"  string="Source Loc."/>
+                                        <field name="state" invisible="1"/>
+                                        <button name="%(stock.move_consume)d"
+                                            string="Consume Products" type="action"
+                                            icon="gtk-go-forward" context="{'consume': True}"
+                                            states="draft,waiting,confirmed,assigned" />
+                                        <button
+                                               name="%(stock.track_line)d"
+                                               string="Split in Serial Numbers"
+                                               type="action" icon="gtk-justify-fill"
+                                               states="draft,waiting,confirmed,assigned" />
+                                        <button name="%(stock.move_scrap)d"
+                                            string="Scrap Products" type="action"
+                                            icon="gtk-convert" context="{'scrap': True}"
+                                            states="draft,waiting,confirmed,assigned"/>
+                                    </tree>
+                                </field>
+                                <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
@@ -710,11 +679,12 @@
                                            icon="gtk-convert"
                                            states="done,cancel"/>
                                    </tree>
-                               </field>
+                                </field>
+                            </group>
                         </page>
                         <page string="Finished Products">
-                            <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
-                                mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            <group>
+                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
@@ -730,37 +700,37 @@
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
                             </field>
-
-                            <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                                       widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
-                                       <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
-                                       <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                       <field name="scrapped" invisible="1"/>
-                                       <field name="state" invisible="1"/>
-                                       <button name="%(stock.track_line)d"
-                                            string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                                       <button name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action" icon="gtk-convert"
-                                           states="done,cancel" />
-                                   </tree>
-                               </field>
+                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
+                                <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+                                    <field name="product_id" readonly="1"/>
+                                    <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                    <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="state" invisible="1"/>
+                                    <button name="%(stock.track_line)d"
+                                         string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action" icon="gtk-convert"
+                                        states="done,cancel" />
+                                </tree>
+                            </field>
+                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
-                                icon="terp-stock_format-scientific"
-                                colspan="2" />
-                            <field colspan="4" name="workcenter_lines" nolabel="1">
-                                <form string="Production Work Centers">
-                                    <field colspan="4" name="name"/>
-                                    <field name="workcenter_id" widget="selection"/>
-                                    <field name="sequence"/>
-                                    <field name="cycle"/>
-                                    <field name="hour"/>
+                                icon="terp-stock_format-scientific"/>
+                            <field name="workcenter_lines">
+                                <form string="Production Work Centers" version="7.0">
+                                    <group col="4">
+                                        <field colspan="4" name="name"/>
+                                        <field name="workcenter_id" widget="selection"/>
+                                        <field name="sequence"/>
+                                        <field name="cycle"/>
+                                        <field name="hour"/>
+                                    </group>
                                 </form>
                                 <tree string="Production Work Centers">
                                     <field name="sequence"/>
@@ -774,24 +744,24 @@
                         <page string="Scheduled Products">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
-                                icon="terp-stock_format-scientific"
-                                colspan="2" />
-                            <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
+                                icon="terp-stock_format-scientific"/>
+                            <field name="product_lines"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="priority"/>
-                            <newline/>
-                            <field name="date_start"/>
-                            <field name="date_finished"/>
-                            <field name="picking_id"/>
-                            <field name="move_prod_id"/>
+                            <group col="4">
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="priority"/>
+                                <field name="date_start"/>
+                                <field name="date_finished"/>
+                                <field name="picking_id"/>
+                                <field name="move_prod_id"/><
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -891,54 +861,21 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        
-        <!-- Where is object in py file?-->
-
-        <!--<record id="mrp_production_lot_form_view" model="ir.ui.view">-->
-        <!--    <field name="name">mrp.production.lot.line.form</field>-->
-        <!--    <field name="model">mrp.production.lot.line</field>-->
-        <!--    <field name="type">form</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Production Products">-->
-        <!--            <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="product_id"/>-->
-        <!--            <field name="product_qty"/>-->
-        <!--            <field name="product_uom"/>-->
-        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
-        <!--            <field name="product_uos" groups="product.group_uos"/>-->
-        <!--            <field name="tracking_id"/>-->
-        <!--        </form>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!--<record id="mrp_production_lot_tree_view" model="ir.ui.view">-->
-        <!--    <field name="name">mrp.production.lot.line.tree</field>-->
-        <!--    <field name="model">mrp.production.lot.line</field>-->
-        <!--    <field name="type">tree</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <tree string="Production Products Consommation">-->
-        <!--            <field name="product_id"/>-->
-        <!--            <field name="product_qty"/>-->
-        <!--            <field name="product_uom"/>-->
-        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
-        <!--            <field name="product_uos" groups="product.group_uos"/>-->
-        <!--            <field name="tracking_id"/>-->
-        <!--        </tree>-->
-        <!--    </field>-->
-        <!--</record>-->
 
         <record id="mrp_production_product_form_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.form</field>
             <field name="model">mrp.production.product.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scheduled Products">
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
+                <form string="Scheduled Products" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="product_id"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 251eafc89ea..fa68d1bdcff 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -63,9 +63,11 @@
             <field name="model">report.mrp.inout</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock value variation" type="bar">
-                    <field name="date" select="1"/>
-                    <field name="value" select="1"/>
+                <form string="Stock value variation" version="7.0">
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 258fe4f8356..1c6f3b51e9d 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,24 +6,26 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" layout="manual">
+                <form string="Configure Manufacturing" layout="manual" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-                        <separator string="Manufacturing Order" colspan="4"/>
-                        <field name="module_mrp_operations"/>
-                        <field name="module_stock_planning"/>
-                        <field name="module_mrp_subproduct"/>
-                        <field name="module_mrp_repair"/>
-
-                        <separator string="Logistics" colspan="4"/>
-                        <field name="module_mrp_jit"/>
-                        <field name="module_stock_no_autopicking"/>
-                        <separator string="Bill Of Material" colspan="4"/>
-                        <field name="group_mrp_routings"/>
-                        <field name="group_mrp_properties"/>
+                        <group col="4" string="Manufacturing Order">
+                            <field name="module_mrp_operations"/>
+                            <field name="module_stock_planning"/>
+                            <field name="module_mrp_subproduct"/>
+                            <field name="module_mrp_repair"/>
+                        </group>
+                        <group string="Logistics" col="4"/>
+                            <field name="module_mrp_jit"/>
+                            <field name="module_stock_no_autopicking"/>
+                        </group>
+                        <group string="Bill Of Material" col="4"/>
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 00e94e57c9b..e166e2a96a7 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -4,7 +4,7 @@
         
         <!--  Change Product Quantity -->
         
-		<record id="view_change_production_qty_wizard" model="ir.ui.view">
+        <record id="view_change_production_qty_wizard" model="ir.ui.view">
             <field name="name">Change Product Qty</field>
             <field name="model">change.production.qty</field>
             <field name="type">form</field>
@@ -12,15 +12,15 @@
                 <form string="Change Product Qty">
                     <separator string="Change Quantity" colspan="4"/>
                     <newline/>
-				    <field name="product_qty"/>
-				    <newline/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="change_prod_qty" string="Approve"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <field name="product_qty"/>
+                    <newline/>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -34,5 +34,5 @@
             <field name="target">new</field>            
         </record>
        
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index e1a5d3a1d6e..9bafa51b941 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -4,22 +4,22 @@
         
         <!--  Product Cost Structure Report -->
         
-		<record id="view_mrp_product_price_wizard" model="ir.ui.view">
+        <record id="view_mrp_product_price_wizard" model="ir.ui.view">
             <field name="name">Product Cost Structure</field>
             <field name="model">mrp.product_price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure">
                     <separator colspan="4" string="Print Cost Structure of Product." />
-				    <field name="number"/>
-				    <newline/>
+                    <field name="number"/>
+                    <newline/>
                     <separator string="" colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -27,9 +27,9 @@
        <act_window name="Product Cost Structure"
             res_model="mrp.product_price"
             src_model="product.product"
-		    view_mode="form"
-		    target="new"        
+            view_mode="form"
+            target="new"        
             key2="client_print_multi"    
-		    id="action_view_mrp_product_price_wizard"/>
-	</data>
-</openerp>	
+            id="action_view_mrp_product_price_wizard"/>
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 187574e0e6f..c0576405788 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -5,24 +5,24 @@
         
         <!--  Produce -->
         
-		<record id="view_mrp_product_produce_wizard" model="ir.ui.view">
+        <record id="view_mrp_product_produce_wizard" model="ir.ui.view">
             <field name="name">MRP Product Produce</field>
             <field name="model">mrp.product.produce</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce">
-                	<separator string="Produce" colspan="4"/>
-				    <field name="mode" colspan="4"/>
-				    <field name="product_qty" colspan="2"/>
-                	<newline/>
-                	<separator string="" colspan="4" />
-                	<label string="" colspan="2" />
-                	<group col="2" colspan="1">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="do_produce" string="Confirm"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <separator string="Produce" colspan="4"/>
+                    <field name="mode" colspan="4"/>
+                    <field name="product_qty" colspan="2"/>
+                    <newline/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2" />
+                    <group col="2" colspan="1">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="do_produce" string="Confirm"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -37,5 +37,5 @@
         </record>    
         
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index d2f675988d4..79a7df1a6a0 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -4,32 +4,32 @@
         
         <!--  Work Center Load Report -->
         
-		<record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
+        <record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
             <field name="name">Work Center Load</field>
             <field name="model">mrp.workcenter.load</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Select time unit">
-				    <field name="time_unit"/>
-				    <newline/>
-				    <field name="measure_unit"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
-				</form>
-			</field>
-		</record>
-		
-		<act_window name="Work Center Load"
+                <form string="Select time unit">
+                    <field name="time_unit"/>
+                    <newline/>
+                    <field name="measure_unit"/>
+                    <newline/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <act_window name="Work Center Load"
             res_model="mrp.workcenter.load"
             src_model="mrp.workcenter"
-		    view_mode="form"
-		    target="new"   
+            view_mode="form"
+            target="new"   
             key2="client_print_multi"    
-		    id="action_mrp_workcenter_load_wizard"/>
-	</data>
+            id="action_mrp_workcenter_load_wizard"/>
+    </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 2ef70a9edf8..88af3975673 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -67,7 +67,7 @@
         <field name="type">form</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
             <header>
                 <button name="button_start_working" string="Start" states="draft"/>
                 <button name="button_resume" string="Resume" states="pause"/>
@@ -77,46 +77,43 @@
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
             </header>
-            <sheet string="Work Orders" layout="auto">
-                <group col="6" colspan="4" class="oe_form_header">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="workcenter_id" select="1" widget="selection"/>
+            <sheet string="Work Orders">
+                <group col="4">
+                    <field colspan="4" name="name"/>
+                    <field name="workcenter_id" widget="selection"/>
                     <field name="production_id"/>
                     <field name="production_state"/>
                     <field name="sequence"/>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                 <page string="Information">
-                    <group colspan="2" col="2">
-                        <separator string="Planned Date" colspan="2"/>
-                        <field name="date_planned"/>
-                        <field name="date_planned_end"/>
-                    </group>
+                    <group>
+                        <group string="Planned Date">
+                            <field name="date_planned"/>
+                            <field name="date_planned_end"/>
+                        </group>
 
-                    <group colspan="2" col="2">
-                        <separator string="Duration" colspan="2"/>
-                        <field name="cycle"/>
-                        <field name="hour" widget="float_time"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Real" colspan="2"/>
-                        <field name="date_start" readonly="1"/>
-                        <field name="date_finished" readonly="1"/>
-                        <field name="delay" widget="float_time"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Product to Produce" colspan="2"/>
-                        <field name="product"/>
-                        <field name="qty"/>
-                        <field name="uom" widget="selection"/>
-                    </group>
+                        <group string="Duration">
+                            <field name="cycle"/>
+                            <field name="hour" widget="float_time"/>
+                        </group>
+                        <group string="Real" >
+                            <field name="date_start" readonly="1"/>
+                            <field name="date_finished" readonly="1"/>
+                            <field name="delay" widget="float_time"/>
+                        </group>
+                        <group string="Product to Produce">
+                            <field name="product"/>
+                            <field name="qty"/>
+                            <field name="uom" widget="selection"/>
+                        </group>
+                    <group>
                 </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
@@ -278,9 +275,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Production Operation Code">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="start_stop" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="start_stop"/>
             </tree>
         </field>
     </record>
@@ -289,10 +286,12 @@
         <field name="model">mrp_operations.operation.code</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Production Operation Code">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="start_stop" select="1"/>
+            <form string="Production Operation Code" version="7.0">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="start_stop"/>
+                </group>
             </form>
         </field>
     </record>