diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 1cd4336ab6c..bf8ab3c11e9 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -76,12 +76,13 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Working Time">
-                    <field name="name"/>
-                    <field name="manager"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <separator string="" colspan="4"/>
-                    <field name="attendance_ids" colspan="4" nolabel="1"/>
+                <form string="Working Time" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                    <field name="attendance_ids"/>
                 </form>
             </field>
         </record>
@@ -93,8 +94,8 @@
             <field name="arch" type="xml">
                 <tree string="Working Time">
                     <field name="name"/>
-                    <field name="manager" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="manager"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -128,10 +129,10 @@
             <field name="model">resource.calendar.attendance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Working Time">
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Working Time" version="7.0">
+                    <field colspan="4" name="name"/>
                     <field name="date_from"/>
-                    <field name="dayofweek" select="1"/>
+                    <field name="dayofweek"/>
                     <field name="hour_from" widget="float_time"/>
                     <field name="hour_to" widget="float_time"/>
                 </form>
@@ -172,8 +173,8 @@
             <field name="model">resource.resource</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource">
-                   <group col="6" colspan="4">
+                <form string="Resource" version="7.0">
+                   <group col="4">
                        <field name="name" colspan="4"/>
                        <field name="active"/>
                        <newline/>
@@ -218,18 +219,18 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leave Detail">
-                    <group colspan="4" col="6">
-                       <group colspan="2" col="2">
+                <form string="Leave Detail" version="7.0">
+                    <group>
+                       <group>
                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
                            <field name="name" string="Reason"/>
                        </group>
-                       <group colspan="2" col="2">
+                       <group>
                            <field name="date_from"/>
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group colspan="2" col="2">
+                       <group>
                            <field name="date_to"/>
                        </group>
                    </group>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 510a7ac28f7..256ca4648a9 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -63,7 +63,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual">
+                <form string="Sales Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
@@ -92,7 +92,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard" layout="manual">
+                <form string="Sales Manager Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c9dc0951374..ad6ca162eee 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -9,14 +9,20 @@
             <field name="model">sale.shop</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Shop">
-                    <field name="name" select="1"/>
-                    <field name="warehouse_id" required="1" select="1" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Accounting"/>
-                    <field name="payment_default_id"/>
-                    <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" select="1"/>
-                    <field name="project_id" select="1" groups="analytic.group_analytic_accounting"/>
+                <form string="Sales Shop" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="warehouse_id" required="1" widget="selection"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="payment_default_id"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
+                            <field name="project_id" groups="analytic.group_analytic_accounting"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -96,7 +102,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Sales Order" version="7.0">
                     <header>
                         <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
@@ -120,88 +126,78 @@
                         <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
-                <sheet string="Sales Order" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <group col="4" colspan="4">
-                            <field name="name"/>
-                            <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
-                            <field name="client_order_ref"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <field name="invoiced"/>
-                            <field name="shipped"/>
-                        </group>
-                    </group>
-                    <notebook colspan="5">
-                        <page string="Sales Order">
+                <sheet>
+                    <group>
+                        <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <newline/>
-                            <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
-                                <form string="Sales Order Lines">
-                                    <notebook>
-                                        <page string="Order Line">
-                                        <group colspan="4" col="5">
-                                            <field colspan="3"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                            <field name="name" placeholder="Porduct/Service characteristics"/>
- 
-                                            <field
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                            <group colspan="1">
-                                                <field name="product_uom" nolabel="1" groups="product.group_uom"
+                        </group><group>
+                            <field name="name"/>
+                            <field name="date_order"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                            <field name="client_order_ref"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Order Lines">
+                            <field name="order_line">
+                                <form string="Sales Order Lines" version="7.0">
+                                    <field name="product_id"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                    <field name="name" placeholder="Porduct/Service characteristics"/>
+                                    <group>
+                                        <group>
+                                            <label for="product_uom_qty"/>
+                                            <div>
+                                                <field
+                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                    name="product_uom_qty" class="oe_form_inline"
+                                                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
-                                            </group>
-                                            <field name="price_unit"/>
 
-                                            <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field groups="product.group_uos" name="product_uos" nolabel="1"/>
-                                            <newline/>
+                                            </div>
+                                            <label for="product_uos_qty"/>
+                                            <div>
+                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" class="oe_form_inline"/>
+                                            </div>
+                                            <field name="price_unit"/>
+                                            <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                        </group><group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
-                                            <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                            <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                                            <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                                            <separator colspan="5" string="Taxes"/>
-                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <group colspan="5" col="5">
-                                                <separator colspan="5" string="States"/>
-                                                <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                                                <field name="invoiced"/>
-                                                <group attrs="{'invisible':[('invoiced','=',True)]}">
-                                                    <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
-                                                </group>
-                                            </group>
+                                            <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                            <field name="invoiced"/>
+                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                            <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
-                                        </page>
-                                        <page string="Extra Info" groups="product.group_mrp_properties">
+                                        <group col="4">
                                             <field name="type"/>
                                             <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
-                                            <separator colspan="4" string="Properties"/>
-                                            <field name="property_ids" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="History">
+                                        </group>
+                                        <separator string="Properties" colspan="2"/>
+                                        <field name="property_ids"/>
+                                        <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
+                                        <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                                        <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                                        </page>
-                                    </notebook>
+                                        </div>
+                                    </group>
                                 </form>
                                 <tree string="Sales Order Lines">
-                                    <field colspan="4" name="name"/>
+                                    <field name="name"/>
                                     <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                     <field groups="product.group_uos" name="product_uos_qty" string="Quantity (UoS)"/>
@@ -211,8 +207,6 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group colspan="2" col="4" name="bellow_the_lines_hook">
-                            </group>
                             <div class="oe_form_subtotal_footer" colspan="2">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
@@ -220,36 +214,35 @@
                             </div>
                             <div class="oe_clear"/>
 
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="note" nolabel="1" placeholder="Our quotation is valid for 30 days..."/>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Our quotation is valid for 30 days..."/>
                         </page>
                         <page string="Other Information">
-                            <group colspan="2" col="2" name="logistics">
-                                <separator string="Logistic" colspan="2"/>
-                                <field name="incoterm" widget="selection"/>
-                                <field name="picking_policy" required="True"/>
-                                <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                                <field name="invoice_quantity" invisible="True"/>
+                            <group>
+                                <group name="logistics">
+                                    <field name="incoterm" widget="selection"/>
+                                    <field name="picking_policy" required="True"/>
+                                    <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
+                                    <field name="invoice_quantity" invisible="True"/>
+                                </group>
+                                <group>
+                                    <field name="user_id"/>
+                                    <field groups="base.group_no_one" name="origin"/>
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
+                                <group name="sale_pay">
+                                    <field name="payment_term" widget="selection"/>
+                                    <field name="fiscal_position" widget="selection"/>
+                                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                </group>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="References" colspan="2"/>
-                                <field name="user_id"/>
-                                <field groups="base.group_no_one" name="origin"/>
-                            </group>
-                            <group name="sale_pay" colspan="2" col="2">
-                                <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
-                                <field name="fiscal_position" widget="selection"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
-                            <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                            <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
                         </page>
                         <page string="History">
-                            <separator colspan="4" string="Invoices"/>
-                            <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
-                            <separator colspan="4" string="Delivery Orders"/>
-                            <field colspan="4" name="picking_ids" nolabel="1" context="{'default_type': 'out'}">
+                            <separator string="Invoices"/>
+                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <separator string="Delivery Orders"/>
+                            <field name="picking_ids" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
                                     <field name="partner_id"/>
@@ -266,9 +259,9 @@
                         </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>
@@ -397,35 +390,36 @@
             <field name="model">sale.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Order Lines">
-                    <group colspan="4" col="6">
-                        <field name="order_id"/>
-                        <field name="order_partner_id" readonly="1" invisible="1"/>
-                        <field name="invoiced"/>
-
-                        <field name="product_id" readonly="1"/>
-                        <field name="product_uom_qty" readonly="1"/>
-                        <field name="product_uom" groups="product.group_uom"/>
-                        <newline/>
-
-                        <field colspan="4" name="name" groups="base.group_no_one"/>
-                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                    </group>
-                    <separator colspan="4" string="Price"/>
-                    <group colspan="4" col="6">
-                        <field name="price_unit"/>
-                        <field name="discount" groups="sale.group_discount_per_so_line"/>
-                        <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
-                    </group>
-                    <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                    <field colspan="4" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                    <group col="3" colspan="2">
+                <form string="Sales Order Lines" version="7.0">
+                    <header>
                         <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
-                        <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
+                        <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
                         <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                    </header>
+                    <label for="order_id" class="oe_form_readonly_hidden"/>
+                    <h1><field name="order_id"/></h1>
+                    <label for="order_partner_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="order_partner_id"/></h2>
+                    <group>
+                        <group>
+                            <field name="product_id" readonly="1"/>
+                            <field name="name" groups="base.group_no_one"/>
+                            <label name="product_uom_qty"/>
+                            <div>
+                                <field name="product_uom_qty" readonly="1" class="oe_form_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                            </div>
+                        </group><group>
+                            <field name="price_unit"/>
+                            <field name="discount" groups="sale.group_discount_per_so_line"/>
+                            <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
+                            <field name="invoiced"/>
+                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        </group>
                     </group>
+                    <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
+                    <field name="notes" groups="base.group_sale_notes_subtotal"/>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index be3e9b5fefd..84c19665e65 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -6,10 +6,12 @@
             <field name="model">sale.order.line.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Create invoices">
-                 <separator colspan="4" string="Do you really want to create the invoice(s)?" />
-                 <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                 <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+             <form string="Create invoices" version="7.0">
+                <header>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </header>
+                <separator string="Do you really want to create the invoice(s)?" />
             </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ebd59f355c6..8129d5ee24d 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -6,14 +6,16 @@
             <field name="model">sale.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create invoices">
+                <form string="Create invoices" version="7.0">
+                    <header>
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
                     <separator colspan="4" string="Do you really want to create the invoice(s)?" />
-                    <field name="grouped"/>
-                    <newline/>
-                    <field name="invoice_date"/>
-                    <separator string="" colspan="6"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <group>
+                        <field name="grouped"/>
+                        <field name="invoice_date"/>
+                    </group>
                </form>
             </field>
         </record>
@@ -28,7 +30,7 @@
             <field name="target">new</field>
             <field name="multi">True</field>
         </record>
-        
+
         <record model="ir.values" id="sale_order_make_invoice">
             <field name="model_id" ref="sale.model_sale_order" />
             <field name="name">Make Invoices</field>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 8ab55c67c17..9cf21d8fce5 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -6,19 +6,18 @@
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Advance Invoice">
-                    <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
-                    <newline />
-                    <field name="qtty" invisible="1"/>
-                    <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
-                    <field name="amount" colspan="2"/>
-                    <newline />
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="6" />
-                    <group colspan="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Advance Invoice" version="7.0">
+                    <header>
                         <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}"/>
                         <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <group col="4">
+                        <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
+                        <newline />
+                        <field name="qtty" invisible="1"/>
+                        <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
+                        <field name="amount" colspan="2"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index d73a2cee1ef..c2dbaad5c7c 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -8,19 +8,16 @@
           <field name="model">crm.make.sale</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-            <form string="Convert to Quotation" >
-                <group colspan="4">
+            <form string="Convert to Quotation"  version="7.0">
+                <header>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <header>
+                <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
-                <newline/>
-                <separator colspan="4"/>
-                <group col="4" colspan="4">
-                    <label string="" colspan="2"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
-                </group>
             </form>
           </field>
        </record>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 3979318e299..90b1959aff7 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -7,14 +7,14 @@
             <field name="model">sale_journal.invoice.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Type">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="invoicing_method" select="1"/>
-                        <field name="active" select="1"/>
+                <form string="Invoice Type" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="invoicing_method"/>
+                        <field name="active"/>
                     </group>
-                    <separator string="Notes" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -97,7 +97,7 @@
             <field name="inherit_id" ref="stock.vpicktree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -109,7 +109,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -121,7 +121,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -133,7 +133,7 @@
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -145,7 +145,7 @@
             <field name="inherit_id" ref="stock.view_picking_out_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 8b7a7b09764..daa3ab28f8b 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -13,98 +13,98 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']" position="replace">
-                    <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
-                            <form string="Order Line">
-                                <notebook>
-                                    <page string="Order Line">
-                                    <group colspan="4" col="5">
-                                        <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-                                        <field name="sequence" groups="base.group_no_one"/>
-                                        <field colspan="3"
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            name="product_id"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                            select="1"/>
-                                        <field
-                                            name="name" required="0"
-                                            attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
+                    <field name="abstract_line_ids">
+                        <form string="Order Line">
+                            <notebook>
+                                <page string="Order Line">
+                                <group colspan="4" col="5">
+                                    <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                    <field name="sequence" groups="base.group_no_one"/>
+                                    <field colspan="3"
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        name="product_id"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
+                                        select="1"/>
+                                    <field
+                                        name="name" required="0"
+                                        attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
 
-                                        <field
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            name="product_uom_qty"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                        <field name="product_uom"
-                                            nolabel="1"
-                                            groups="product.group_uom"
-                                            required="0"
-                                            attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
-                                            on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
-                                        <field name="price_unit"
-                                            attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+                                    <field
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        name="product_uom_qty"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                                    <field name="product_uom"
+                                        nolabel="1"
+                                        groups="product.group_uom"
+                                        required="0"
+                                        attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+                                        on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                    <field name="price_unit"
+                                        attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
 
-                                        <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-                                        <field groups="product.group_uos" name="product_uos" nolabel="1"/>
-                                        <newline/>
+                                    <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                    <field groups="product.group_uos" name="product_uos" nolabel="1"/>
+                                    <newline/>
 
-                                        <field
-                                            name="product_packaging"
-                                            colspan="3"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
-                                            domain="[('product_id','=',product_id)]"
-                                            groups="product.group_stock_packaging"/>
-                                        <field
-                                            name="discount"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field
+                                        name="product_packaging"
+                                        colspan="3"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
+                                        domain="[('product_id','=',product_id)]"
+                                        groups="product.group_stock_packaging"/>
+                                    <field
+                                        name="discount"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"/>
 
-                                        <group colspan="5"
-                                            attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
-                                            <separator colspan="4" string="Notes"/>
-                                            <field colspan="4" name="notes" nolabel="1"/>
-                                        </group>
-
-                                        <group colspan="5"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}">
-                                            <separator colspan="4" string="Taxes"/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
-                                        </group>
-
-                                        <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                            <separator colspan="5" string="States"/>
-                                            <field name="state"/>
-                                            <field name="invoiced"/>
-                                            <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
-                                        </group>
+                                    <group colspan="5"
+                                        attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
+                                        <separator colspan="4" string="Notes"/>
+                                        <field colspan="4" name="notes" nolabel="1"/>
                                     </group>
-                                    </page>
-                                    <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                        <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
-                                        <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
-                                        <field name="address_allotment_id" select="2"/>
-                                        <separator colspan="4" string="Properties"/>
-                                        <field colspan="4" name="property_ids" nolabel="1"/>
-                                    </page>
-                                    <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                        <separator colspan="4" string="Invoice Lines"/>
-                                        <field colspan="4" name="invoice_lines" nolabel="1"/>
-                                        <separator colspan="4" string="Stock Moves"/>
-                                        <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                            <tree string="Sales order lines">
-                                    <field colspan="4" name="name"/>
-                                    <field name="product_uom_qty" string="Qty"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="discount"/>
-                                    <field name="price_unit"/>
-                                    <!-- field name="price_net"/-->
-                                    <field name="price_subtotal"/>
-                                    <field name="sequence"/>
-                                </tree>
+
+                                    <group colspan="5"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <separator colspan="4" string="Taxes"/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
+                                    </group>
+
+                                    <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <separator colspan="5" string="States"/>
+                                        <field name="state"/>
+                                        <field name="invoiced"/>
+                                        <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
+                                    </group>
+                                </group>
+                                </page>
+                                <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field name="address_allotment_id" select="2"/>
+                                    <separator colspan="4" string="Properties"/>
+                                    <field colspan="4" name="property_ids" nolabel="1"/>
+                                </page>
+                                <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <separator colspan="4" string="Invoice Lines"/>
+                                    <field colspan="4" name="invoice_lines" nolabel="1"/>
+                                    <separator colspan="4" string="Stock Moves"/>
+                                    <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                </page>
+                            </notebook>
+                        </form>
+                        <tree string="Sales order lines">
+                            <field colspan="4" name="name"/>
+                            <field name="product_uom_qty" string="Qty"/>
+                            <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                            <field name="discount"/>
+                            <field name="price_unit"/>
+                            <!-- field name="price_net"/-->
+                            <field name="price_subtotal"/>
+                            <field name="sequence"/>
+                        </tree>
                     </field>
                 </xpath>
             </field>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 6008d45e58a..e6254264e1f 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -7,17 +7,18 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sharing: preparation">
-                    <separator colspan="4"
-                        string="Please select the action that opens the screen containing the data you want to share."/>
-                    <field name="action_id" colspan="4"/>
-                    <separator colspan="4"
-                        string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
-                    <field name="domain"/>
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <form string="Sharing: preparation" version="7.0">
+                    <header>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward"/>
                         <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                        <button name="go_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
+                    <header>
+                    <separator
+                        string="Please select the action that opens the screen containing the data you want to share."/>
+                    <group>
+                        <field name="action_id"/>
+                        <label colspan="2"
+                            string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
+                        <field name="domain"/>
                     </group>
                 </form>
             </field>
@@ -28,32 +29,29 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
+                    <header>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward"/>
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
-                    <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
-                    </group>
-                    <group colspan="4" col="2" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field name="email_1"/>
-                        <field name="email_2"/>
-                        <field name="email_3"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}">
-                        <separator colspan="4" string="Include an Optional Personal Message"/>
-                        <field name="message" colspan="4" nolabel="1"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('invite', '=', True)]}">
-                        <separator colspan="4" string="Sharing Options"/>
-                        <field name="name" colspan="4"/>
-                        <field name="access_mode" colspan="4"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4">
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                        <button name="go_step_2" string="Share" colspan="1" type="object" icon="gtk-go-forward"/>
+                    <group>
+                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
+                            <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
+                        </group>
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)">
+                            <field name="email_1"/>
+                            <field name="email_2"/>
+                            <field name="email_3"/>
+                        </group>
+                        <group attrs="{'invisible':[('user_type', '=', 'embedded')]}" string="Include an Optional Personal Message">
+                            <field name="message" colspan="2" nolabel="1"/>
+                        </group>
+                        <group attrs="{'invisible':[('invite', '=', True)]}" string="Sharing Options">
+                            <field name="name"/>
+                            <field name="access_mode"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -64,35 +62,36 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Access granted!">
-                  <field name="user_type" invisible="1"/>
-                  <field name="access_mode" invisible="1"/>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','=','embedded')]}">
-                    <separator string="An e-mail notification with instructions has been sent to the following people:"/>
-                     <field name="result_line_ids" nolabel="1" mode="tree">
-                        <tree string="Summary">
-                            <field name="login"/>
-                        </tree>
-                        <form string="Access info">
-                            <field name="login"/>
-                        </form>
-		            </field>
-                  </group>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
-		            <separator string="Use this Link"/>
-		            <field name="embed_url" nolabel="1"/>
-		            <separator string="Or insert the following code where you want to embed your documents"/>
-		            <group col="4" string="Options">
-			            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
-			            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
-		            </group>
-		            <field name="embed_code" nolabel="1"/>
-                  </group>
-
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <form string="Access granted!" version="7.0">
+                    <header>
                         <button special="cancel" string="Close" icon='gtk-ok'/>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </header>
+                    <group attrs="{'invisible':[('user_type','=','embedded')]}">
+                        <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                        <field name="result_line_ids" nolabel="1" mode="tree">
+                            <tree string="Summary">
+                                <field name="login"/>
+                            </tree>
+                            <form string="Access info" version="7.0">
+                                <group>
+                                    <field name="login"/>
+                                </group>
+                            </form>
+                        </field>
                     </group>
+                    <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
+                        <separator string="Use this Link"/>
+                        <field name="embed_url"/>
+                        <separator string="Or insert the following code where you want to embed your documents"/>
+                        <group string="Options">
+                            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
+                            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
+                            <field name="embed_code"/>
+                        </group>
+                    </group>
+
                 </form>
             </field>
         </record>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index aca84d33473..49e0e9c1880 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,11 +8,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                   <field name="pricelist_id" position="before">
-                       <field name="location_id" widget="selection" context="{'location': self}"/>
-                       <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
-                       <separator orientation="vertical"/>
-                   </field>
+                <field name="pricelist_id" position="before">
+                    <field name="location_id" widget="selection" context="{'location': self}"/>
+                    <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
+                </field>
             </field>
         </record>
 
@@ -22,9 +21,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group col="2" colspan="2">
-                        <separator string="Accounting Stock Properties" colspan="2"/>
+                <form position="inside" version="7.0">
+                    <group string="Accounting Stock Properties">
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
@@ -42,13 +40,15 @@
             <field name="arch" type="xml">
                 <page position="after" string="Information">
                     <page string="Properties">
-                        <separator string="Counter-Part Locations Properties" groups="stock.group_locations" colspan="4"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
-                        <separator string="Accounting Entries" colspan="4"/>
-                        <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <group string="Counter-Part Locations Properties" groups="stock.group_locations">
+                            <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                            <field name="property_stock_production" domain="[('usage','=','production')]"/>
+                            <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
+                        </group>
+                        <group string="Accounting Entries">
+                            <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
                     </page>
                 </page>
             </field>