diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f672d90616e..42abaf96418 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -608,21 +608,6 @@
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
         </record>
 
-        <record id="product_normal_form_pos_view" model="ir.ui.view">
-            <field name="name">product.normal.pos.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                  <group name="status" position="after">
-                      <group name="pos" string="Point of Sale">
-                          <field name="pos_categ_id"/>
-                          <field name="to_weight" />
-                      </group>
-                  </group>
-            </field>
-        </record>
-
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
@@ -630,6 +615,8 @@
             <field name="arch" type="xml">
                 <group name="sale" position="inside">
                     <group name="pos" string="Point of Sale">
+                        <field name="pos_categ_id"/>
+                        <field name="to_weight" />
                         <field name="income_pdt"/>
                         <field name="expense_pdt"/>
                     </group>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 005b1ac7262..8d77a9844b0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -123,6 +123,12 @@
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
+                                    </group>
                                     <group groups="product.group_stock_packaging" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
@@ -132,14 +138,17 @@
                             </page>
                             <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
                                 <group name="sale">
-                                    <group>
+                                    <group string="Sale Conditions">
                                         <label for="sale_delay"/>
                                         <div>
                                             <field name="sale_delay" class="oe_inline"/> days
                                         </div>
-                                        <field name="warranty" class="oe_inline"/> months
+                                        <label for="warranty"/>
+                                        <div>
+                                            <field name="warranty" class="oe_inline"/> months
+                                        </div>
                                     </group>
-                                    <group groups="product.group_uos">
+                                    <group groups="product.group_uos" string="Unit of Measure">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
                                         <field name="mes_type"/>
@@ -735,7 +744,10 @@
                             <group>
                                 <group name="delay" string="Delays">
                                     <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay"/>
+                                    <label for="produce_delay"/>
+                                    <div>
+                                        <field name="produce_delay" class="oe_inline"/> days
+                                    </div>
                                     <field name="warranty"/>
                                 </group>
                                 <group name="store" string="Storage Localisation">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index e5986318fbd..43e00c5a238 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -58,15 +58,14 @@
             <field name="arch" type="xml">
                 <group name="procurement" position="inside">
                     <group name="delay" string="Delays">
+                        <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <div attrs="{'invisible':[('type','=','service')]}">
+                            <field name="produce_delay" class="oe_inline"/> days
+                        </div>
                         <field name="active"/>
-                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                    </group>
-                    <group name="store" string="Storage Localisation">
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
                     </group>
+                </group>
+                <group name="inventory" position="inside">
                     <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>