diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 21e3dd5aa25..10f352488d6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -8,8 +8,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
-                <field name="name" select="1" />
-                <field name="product_id" select="1" />
+                <field name="name" />
+                <field name="product_id" />
                 <field name="move_id"/>
                 <field name="partner_id"/>
                 <field name="address_id"/>
@@ -27,7 +27,7 @@
         <field name="model">mrp.repair</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
                <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                    <button name="repair_ready" states="confirmed" string="Start Repair"/>
@@ -42,54 +42,59 @@
                    <button name="cancel" states="draft" string="Cancel Repair"/>
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </header>
-               <sheet string="Repairs order" layout="auto">
-                <group col="6" colspan="4" class="oe_form_header">
-                    <field name="name"/>
-                    <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
-                    <field name="deliver_bool"/>
-                    <newline/>
-                    <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
-                    <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
-                    <field name="repaired"/>
-                    <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
-                    <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                    <field name="invoiced"/>
-                </group>
-                <notebook colspan="4">
+               <sheet string="Repairs order">
+                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    </h1>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="name"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
+                            <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
+                            <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                            <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
+                        </group>
+                        <group>
+                            <field name="deliver_bool"/>
+                            <field name="repaired"/>
+                            <field name="invoiced"/>
+                            <field name="guarantee_limit" />
+                        </group>
+                    </group>
+                <notebook>
                     <page string="Operations">
-                        <field name="guarantee_limit" />
-                        <newline/>
-                        <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
-                            <form string="Operations">
+                        <field name="operations">
+                            <form string="Operations" version="7.0">
                                 <notebook>
                                     <page string="Repair Line">
-                                        <field name="name" colspan="4"/>
-                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
-                                        <field name='prodlot_id'/>
-                                        <field name="product_uom_qty" string="Qty" />
-                                        <field name="product_uom" string="Unit of Measure"/>
-                                        <field name="price_unit"/>
-                                        <field name="price_subtotal"/>
-                                        <field name="location_id"/>
-                                        <field name="location_dest_id"/>
-                                        <newline/>
-                                        <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
-                                        <group colspan="2">
+                                        <group col="4">
+                                            <field name="name" colspan="4"/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                            <field name='prodlot_id'/>
+                                            <field name="product_uom_qty" string="Qty" />
+                                            <field name="product_uom" string="Unit of Measure"/>
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
+                                            <field name="location_id"/>
+                                            <field name="location_dest_id"/>
+                                            <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                             <field name="to_invoice"/>
+                                            <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
                                         </group>
-                                        <newline/>
-                                        <separator colspan="4" string="Taxes"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                         <separator colspan="4" string="States"/>
                                         <field name="state"/>
                                     </page>
                                     <page string="History">
-                                        <field colspan="4" name="move_id" />
-                                        <field colspan="4" name="invoice_line_id"/>
+                                        <group>
+                                            <field name="move_id" />
+                                            <field name="invoice_line_id"/>
+                                        </group>
                                     </page>
-
                                  </notebook>
                             </form>
                             <tree string="Operations" editable="bottom">
@@ -107,42 +112,41 @@
                                 <field name="price_subtotal"/>
                             </tree>
                         </field>
-                        <newline/>
-                        <group col="7" colspan="4">
+                        <div class="oe_form_subtotal_footer">
                             <field name="amount_untaxed" sum="Untaxed amount"/>
                             <field name="amount_tax"/>
                             <field name="amount_total" sum="Total amount"/>
                             <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        </group>
+                        </div>
+                        <div class="oe_clear"/>
                     </page>
                     <page string="Invoicing">
-                        <field name="invoice_method" colspan="4"/>
-                        <field
-                            name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
-                            attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
-                        <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        <group col="4">
+                            <field name="invoice_method"/>
+                            <field
+                                name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
+                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        </group>
                         <!-- <field name="invoice_id"/> -->
-                        <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
-                            <form string="Fees">
+                        <field name="fees_lines">
+                            <form string="Fees" version="7.0">
                                 <notebook>
                                     <page string="Fees Line">
-                                        <field name='name'/>
-                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
-                                        <field name="product_uom_qty" string="Qty"/>
-                                        <field name="product_uom" string="Unit of Measure" />
-                                        <field name="price_unit"/>
-                                        <field name="price_subtotal"/>
-                                        <newline/>
-                                        <group colspan="2">
+                                        <group col="4">
+                                            <field name='name'/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
+                                            <field name="product_uom_qty" string="Qty"/>
+                                            <field name="product_uom" string="Unit of Measure" />
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
                                             <field name="to_invoice"/>
                                             <field name="invoiced"/>
+                                            <field widget="many2many_tags" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                         </group>
-                                        <newline/>
-                                        <separator colspan="4" string="Taxes"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                      </page>
                                      <page string="History">
-                                        <field colspan="4" name="invoice_line_id" />
+                                        <field name="invoice_line_id" />
                                     </page>
                                   </notebook>
                             </form>
@@ -158,17 +162,19 @@
                         </field>
                     </page>
                     <page string="Extra Info">
-                        <field name="invoice_id"/>
-                        <field name="picking_id"/>
-                        <field name="location_id"/>
-                        <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <group col="4">
+                            <field name="invoice_id"/>
+                            <field name="picking_id"/>
+                            <field name="location_id"/>
+                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </page>
                     <page string="Notes">
-                        <separator colspan="4" string="Internal Notes"/>
-                        <field colspan="4" name="internal_notes" nolabel="1"/>
-                        <separator colspan="4" string="Quotation Notes"/>
-                        <field colspan="4" name="quotation_notes" nolabel="1"/>
+                        <separator string="Internal Notes"/>
+                        <field name="internal_notes"/>
+                        <separator string="Quotation Notes"/>
+                        <field name="quotation_notes"/>
                     </page>
                 </notebook>
                 </sheet>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index e307580be7b..0ab66e80bb6 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -4,20 +4,17 @@
         
         <!--  Cancel Repair -->
         
-		<record id="view_cancel_repair" model="ir.ui.view">
+        <record id="view_cancel_repair" model="ir.ui.view">
             <field name="name">Cancel Repair</field>
             <field name="model">mrp.repair.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cancel Repair Order">
-				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon="gtk-stop" special="cancel"
-                			string="No" />
-                		<button name="cancel_repair" string="Yes"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Cancel Repair Order" version="7.0">
+                    <header>
+                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" />
+                        <button icon="gtk-stop" special="cancel" string="No" />
+                    <header>
+                    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                 </form>
             </field>
         </record>         
@@ -30,7 +27,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record> 
- 		
+         
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 92804d0cb23..0b822d97d59 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -4,32 +4,30 @@
         
         <!--  Make Invoice -->
         
-		<record id="view_make_invoice" model="ir.ui.view">
+        <record id="view_make_invoice" model="ir.ui.view">
             <field name="name">Make Invoice</field>
             <field name="model">mrp.repair.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)?" />  
-			        <field name="group"/>
-                    <newline/>  
-                    <group col="2" colspan="4">                        
-                		<button icon="gtk-stop" special="cancel"
-                			string="Cancel" />
-                		<button name="make_invoices" string="Create Invoice"
-                			colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
-                	</group>
+            <form string="Create invoices" version="7.0">
+                <header>
+                    <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" />
+                <header>
+                <group string="Do you really want to create the invoice(s)?">
+                    <field name="group"/>
+                </group>
                 </form>
             </field>
         </record>
 
-        <act_window name="Make Invoice"		    
-		    res_model="mrp.repair.make_invoice"
-		    src_model="mrp.repair"
-		    view_mode="form"
-		    target="new"        
+        <act_window name="Make Invoice"            
+            res_model="mrp.repair.make_invoice"
+            src_model="mrp.repair"
+            view_mode="form"
+            target="new"        
             key2="client_action_multi"    
-		    id="act_mrp_repair_invoice"/>        
+            id="act_mrp_repair_invoice"/>        
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 70b3ea8efaa..652490685e0 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -9,18 +9,20 @@
             <field name="arch" type="xml">
              <notebook position="inside">
                  <page string="Sub Products" position="inside">
-                     <field colspan="4" name="sub_products" nolabel="1" widget="one2many_list">
+                     <field name="sub_products">
                          <tree string="sub products"  editable="top">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
                              <field name="product_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
-                         <form string="Sub Products">
-                             <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom"/>
-                             <field name="product_qty"/>
-                             <field name="subproduct_type"/>
+                         <form string="Sub Products" version="7.0">
+                             <group col="4">
+                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                 <field name="product_uom"/>
+                                 <field name="product_qty"/>
+                                 <field name="subproduct_type"/>
+                             </group>
                          </form>
                     </field>
                 </page>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 68029a96d7a..40acb25fc0e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,7 +16,7 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="PoS Orders">
+                <form string="PoS Orders" version="7.0">
                 <header>
                     <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
@@ -46,7 +46,7 @@
                                     <field name="price_subtotal"/>
                                     <field name="price_subtotal_incl"/>
                                 </tree>
-                                <form string="Order lines">
+                                <form string="Order lines" version="7.0">
                                     <group col="4">
                                         <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
                                         <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
@@ -71,7 +71,7 @@
                                     <field name="statement_id" />
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
+                                <form string="Statement lines" version="7.0">
                                     <group col="4">
                                         <field name="account_id"/>
                                         <field name="amount"/>
@@ -204,7 +204,7 @@
             <field name="model">pos.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS Order line">
+                <form string="POS Order line" version="7.0">
                     <group col="4">
                         <field name="product_id" />
                         <field name="qty" />
@@ -253,7 +253,7 @@
             <field name="model">report.transaction.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
+                <form string="POS " version="7.0">
                     <group col="4">
                         <field name="user_id"/>
                         <field name="journal_id"/>
@@ -346,7 +346,7 @@
             <field name="model">report.sales.by.user.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
+                <form string="POS " version="7.0">
                     <grouop col="4">
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
@@ -414,7 +414,7 @@
             <field name="model">report.sales.by.user.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
+                <form string="POS " version="7.0">
                     <group col="4">
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
@@ -482,7 +482,7 @@
             <field name="model">report.sales.by.margin.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
+                <form string="POS " version="7.0">
                     <group col="4">
                         <field name="user_id"/>
                         <field name="product_name"/>
@@ -551,7 +551,7 @@
             <field name="model">report.sales.by.margin.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
+                <form string="POS " version="7.0">
                     <group col="4">
                         <field name="user_id"/>
                         <field name="product_name"/>
@@ -650,7 +650,7 @@
             <field name="model">pos.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="PoS Categories">
+                <form string="PoS Categories" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 9ba291aec8a..bf371ee37ae 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.box.entries</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Put Money">
+                <form string="Put Money" version="7.0">
                     <header>
                         <button name="get_in" string="Put Money" type="object" icon="gtk-apply" />
                         <button icon="gtk-stop" special="cancel" string="Cancel" />
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 71e788b88fa..d9d2cf1e37b 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Output Operation">
+                <form string="Output Operation" version="7.0">
                     <header>
                         <button name="get_out" string="Take Money" type="object" icon="gtk-apply" />
                         <button icon="gtk-stop" special="cancel" string="Cancel" />
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index aba93d64bd6..0231427dc8c 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.close.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close Cash Registers">
+                <form string="Close Cash Registers" version="7.0">
                     <header>
                         <button name="close_statement" string="Yes"
                              type="object" icon="gtk-ok"/>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 0a573d56049..1a63a8e9407 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -7,7 +7,7 @@
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Post All Orders">
+                <form string="Post All Orders" version="7.0">
                     <header>
                         <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok"/>
                         <button icon='gtk-cancel' special="cancel" string="Cancel" />
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 4bc760f7e8e..caf49000e45 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.details</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS Details">
+                <form string="POS Details" version="7.0">
                     <header>
                             <button icon='gtk-cancel' special="cancel"
                                     string="Close" />
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 1daf3eb1ec3..89ee1a8c08a 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.discount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Apply Discount">
+                <form string="Apply Discount" version="7.0">
                     <header>
                         <button icon='gtk-cancel' special="cancel" string="Close" />
                         <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" />
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index f53d49bd4cc..7ee9b206e0b 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.open.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Open Statements">
+                <form string="Open Statements" version="7.0">
                     <header>
                          <button name="open_statement" string="Open Registers"
                              type="object" icon="gtk-ok"/>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 6c42f1296b0..d7eaf23334b 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -7,7 +7,7 @@
             <field name="model">pos.make.payment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Add payment :">
+            <form string="Add payment :" version="7.0">
                 <header>
                     <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
                     <button icon="gtk-stop" special="cancel" string="Cancel"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index ff1dbc01923..9c202c8c3c6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Report">
+                <form string="Payment Report" version="7.0">
                     <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
                     <button icon='gtk-cancel' special="cancel" string="Close" />
                 </form>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index f1577e7b460..4421d5263b8 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Pyament Report ">
+                <form string="Pyament Report " version="7.0">
                     <header>
                         <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
                         <button icon='gtk-cancel' special="cancel" string="Close" />
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 0f41e4b719a..07cafd997ed 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -6,7 +6,7 @@
             <field name="model">pos.payment.report.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sale by User">
+                <form string="Sale by User" version="7.0">
                     <header>
                         <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
                         <button icon='gtk-cancel' special="cancel" string="Close" />
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 4286b528a09..8580890f594 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -9,7 +9,7 @@
               <field name="model">pos.receipt</field>
               <field name="type">form</field>
               <field name="arch" type="xml">
-                <form string="Receipt :">
+                <form string="Receipt :" version="7.0">
                     <header>
                       <button icon='gtk-cancel' special="cancel" string="Cancel" />
                       <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" />
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index c369bed908c..3d735f87fb7 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -6,7 +6,7 @@
             <field name="model">pos.return</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Return lines">
+                <form string="Return lines" version="7.0">
                     <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
                     <button icon='gtk-cancel' special="cancel" string="Cancel" />
                  </form>
@@ -39,7 +39,7 @@
             <field name="model">pos.return.memory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                     <group col="4">
                         <field name="product_id" />
                         <field name="quantity" />
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index b0f9008b864..95a1a3d7e6f 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -8,7 +8,7 @@
             <field name="model">pos.sale.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sale By User">
+                <form string="Sale By User" version="7.0">
                     <header>
                         <button icon='gtk-cancel' special="cancel"
                             string="Close" />
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index a2cfdf775fa..d35ce5e240b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -16,7 +16,7 @@
             <field name="model">res.portal.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Portal Access">
+                <form string="Add Portal Access" version="7.0">
                     <header>
                         <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button string="Send Invitations"
@@ -54,7 +54,7 @@
             <field name="model">res.portal.wizard.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Portal User">
+                <form string="Portal User" version="7.0">
                     <group colspan="2" col="2">
                         <field name="name"/>
                         <field name="user_email"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 0ff93076a45..268820f92d3 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -13,7 +13,7 @@
         <field name="model">process.process</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process">
+            <form string="Process" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="model_id"/>
@@ -24,22 +24,22 @@
                         <field name="node_ids" colspan="4" nolabel="1">
                             <tree string="Process Nodes">
                                 <field name="name"/>
-                                <field name="model_id" select="1"/>
-                                <field name="kind" select="1"/>
+                                <field name="model_id"/>
+                                <field name="kind"/>
                                 <field name="flow_start"/>
                             </tree>
-                            <form string="Process Node">
+                            <form string="Process Node" version="7.0">
                                 <group colspan="4" col="4">
                                     <field name="name"/>
                                     <field name="flow_start"/>
-                                    <field name="kind" select="1"/>
+                                    <field name="kind"/>
                                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
 
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Properties">
                                         <group colspan="4" col="6">
-                                            <field name="model_id" select="1"/>
+                                            <field name="model_id"/>
                                             <field name="menu_id"/>
                                             <field name="help_url" widget="url"/>
                                         </group>
@@ -95,7 +95,7 @@
         <field name="arch" type="xml">
             <tree string="Process">
                 <field name="name"/>
-                <field name="model_id" select="1"/>
+                <field name="model_id"/>
                 <field name="active"/>
             </tree>
         </field>
@@ -139,9 +139,9 @@
         <field name="arch" type="xml">
             <tree string="Process Nodes">
                 <field name="name"/>
-                <field name="process_id" select="1"/>
-                <field name="model_id" select="1"/>
-                <field name="kind" select="1"/>
+                <field name="process_id"/>
+                <field name="model_id"/>
+                <field name="kind"/>
                 <field name="flow_start"/>
             </tree>
         </field>
@@ -152,12 +152,12 @@
         <field name="model">process.node</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Node">
+            <form string="Process Node" version="7.0">
                 <group colspan="4" col="6">
                     <field name="name"/>
                     <field name="process_id"/>
                     <field name="flow_start"/>
-                    <field name="kind" select="1"/>
+                    <field name="kind"/>
                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
                 </group>
                 <notebook>
@@ -251,7 +251,7 @@
         <field name="model">process.transition</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Transition">
+            <form string="Process Transition" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="source_node_id"/>
@@ -265,7 +265,7 @@
                                 <field name="state"/>
                                 <field name="action"/>
                             </tree>
-                            <form string="Actions">
+                            <form string="Actions" version="7.0">
                                 <group col="4">
                                     <field name="name" colspan="4"/>
                                     <field name="state"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 8c27e964c46..d94ac882cda 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,7 +46,7 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement">
+                <form string="Procurement" version="7.0">
                     <header>
                         <button name="button_confirm" states="draft" string="Confirm"/>
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
@@ -206,7 +206,7 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reordering Rules">
+                <form string="Reordering Rules" version="7.0">
                     <group col="2" colspan="2">
                         <separator string="General Information" colspan="2" />
                         <field name="name" />
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 0eb4ce4f227..74007305ab7 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,7 +9,7 @@
             <field name="model">make.procurement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement Request">
+                <form string="Procurement Request" version="7.0">
                     <header>
                         <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" />
                         <button icon='gtk-cancel' special="cancel" string="Cancel" />
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 2ba1ec638b1..dd75f916f6e 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -9,7 +9,7 @@
             <field name="model">procurement.order.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Parameters">
+                <form string="Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Procurements"
                             type="object" icon="gtk-ok" />
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index f3981c12ca1..051abea849d 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -9,7 +9,7 @@
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Parameters">
+                <form string="Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
                         <button icon='gtk-cancel' special="cancel" string="Cancel" />
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 6a4e50936c7..cdd7be0de1f 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -9,7 +9,7 @@
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                    <form string="Scheduler Parameters">
+                <form string="Scheduler Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
                         <button icon='gtk-cancel' special="cancel" string="Cancel" />