diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index ff55108a26d..6ac3c190e83 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="2" col="2" groups="base.group_stock_inventory_properties">
             <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_extended" />
-            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
+            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_stock_inventory_properties" />
+            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_stock_inventory_properties"/>
           </group>
         </page>
       </field>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index f8f8b1e81f1..b20a148a696 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -42,13 +42,13 @@ class warehouse_configuration(osv.osv_memory):
                         help="""This allows to automatically launch
                         the invoicing wizard if the delivery is to be invoiced When you send or deliver goods.
                         It installs the stock_invoice_directly module."""),
-        'module_product_expiry': fields.boolean("Allow to manage expiry date on product ",
+        'module_product_expiry': fields.boolean("Allow to manage expiry date on product",
                         help="""Track different dates on products and production lots.
                         Following dates can be tracked:
                         - end of life
                         - best before date
                         - removal date
-                        - alert date
+                        - alert date.
                         It installs the product_expiry module."""),
         'group_stock_production_lot':fields.boolean("Track production lot",group='base.group_user', implied_group='base.group_stock_production_lot',
                            help="""This allows you to manage products produced by you using production lots (serial numbers).
@@ -58,14 +58,14 @@ class warehouse_configuration(osv.osv_memory):
                            help="""Allows you to get the upstream or downstream traceability of the products contained in lot.
                            It assigns the "Tracking lots" group to employee."""),
         'group_stock_inventory_valuation':fields.boolean("Track inventory valuation by products ",group='base.group_user', implied_group='base.group_stock_inventory_valuation',
-                           help="""
+                           help="""This allows to split stock inventory lines according to production lot.
                            It assigns the "Inventory valuation" group to employee."""),
         'group_stock_counterpart_location':fields.boolean("Manage your stock counterpart by products",group='base.group_user', implied_group='base.group_stock_counterpart_location',
-                           help="""
+                           help="""This allows to use different stock locations instead of the default one for procurement, production and inventory.
                            It assigns the "Counter-Part Locations" group to employee."""),
         'group_stock_inventory_properties':fields.boolean("Define stock locations",group='base.group_user', implied_group='base.group_stock_inventory_properties',
-                           help=""".
-                           It assigns the "" group to employee."""),
+                           help="""This allows you to set destination location for goods you send to partner or goods you receive from the current partner.
+                           It assigns the "Inventory properties in partner form" group to employee."""),
     }
 
 warehouse_configuration()
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 46ab77e2e3d..00b8cbe6438 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -5,56 +5,52 @@
             <field name="name">Warehouse Application</field>
             <field name="model">warehouse.configuration</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_res_config_settings"/>
             <field name="arch" type="xml">
-            <form position ="replace">
-	            <form string ="Warehouse Application">
-		            <separator string="Traceability" colspan="4"/>
-                    <group  colspan="2" col="4">
-                        <newline/>
-                        <field name="group_stock_production_lot"/>
-                        <newline/>
-                        <field name="group_stock_tracking_lot"/>
-                        <newline/>
-                        <field name="module_product_expiry"/>
-                    </group>
+	        <form string ="Warehouse Application">
+	            <separator string="Traceability" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                       <field name="group_stock_production_lot"/>
+                       <newline/>
+                       <field name="group_stock_tracking_lot"/>
+                       <newline/>
+                       <field name="module_product_expiry"/>
+                   </group>
 
-		            <separator string="Logistic" colspan="4"/>
-                    <group  colspan="2" col="4">
-                        <newline/>
-                        <field name="module_stock_no_autopicking"/>
-                        <newline/>
-                        <field name="module_stock_invoice_directly"/>
-                        <newline/>
-                    </group>
+	            <separator string="Logistic" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                       <field name="module_stock_no_autopicking"/>
+                       <newline/>
+                       <field name="module_stock_invoice_directly"/>
+                       <newline/>
+                   </group>
 
-                    <separator string="Products" colspan="4"/>
-                    <group colspan="4" col="8">
-                        <group  colspan="2" col="4">
-                           <field name="group_stock_packaging"/>
+                   <separator string="Products" colspan="4"/>
+                   <group colspan="4" col="8">
+                       <group  colspan="2" col="4">
+                          <field name="group_stock_packaging"/>
+                          <newline/>
+                          <field name="group_sale_uom_per_product"/>
+                          <newline/>
+                       </group>
+                       <group colspan="2" col="4">
                            <newline/>
-                           <field name="group_stock_uom"/>
+                           <field name="group_stock_inventory_valuation"/>
                            <newline/>
-                        </group>
-                        <group colspan="2" col="4">
-                            <newline/>
-                            <field name="group_stock_inventory_valuation"/>
-                            <newline/>
-                            <field name="group_stock_counterpart_location"/>
-                            <newline/>
-                        </group>
-                    </group>
+                           <field name="group_stock_counterpart_location"/>
+                           <newline/>
+                       </group>
+                   </group>
 
-		            <separator string="Partners" colspan="4"/>
-                    <group  colspan="2" col="4">
-                        <newline/>
-	                    <field name="group_stock_inventory_properties"/>
-	                    <newline/>
-	                    <field name="module_claim_from_delivery"/>
-	                    <newline/>
-                    </group>
-
-	                </form>
+	            <separator string="Partners" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                    <field name="group_stock_inventory_properties"/>
+                    <newline/>
+                    <field name="module_claim_from_delivery"/>
+                    <newline/>
+                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 692c72ac690..33ed330c7dd 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -37,6 +37,14 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(6,0,[ref('base.group_stock_production_lot'),
+        ref('base.group_stock_tracking_lot'),
+        ref('base.group_stock_inventory_valuation'),
+        ref('base.group_stock_inventory_properties'),
+        ref('base.group_stock_counterpart_location')])]"/>
+    </record>
+
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index de1019906db..1fb3a377e91 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -26,7 +26,7 @@
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
          <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
-            parent="stock.menu_product_in_config_stock"  sequence="2" groups="base.group_stock_uom"/>
+            parent="stock.menu_product_in_config_stock"  sequence="2" groups="base.group_sale_uom_per_product"/>
          <menuitem
              action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
              parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
@@ -42,7 +42,7 @@
                 <tree string="Stock Inventory Lines">
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom" groups="base.group_stock_uom"/>
+                    <field name="product_uom" groups="base.group_sale_uom_per_product"/>
                     <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                             string="Split inventory lines" groups="base.group_stock_inventory_valuation"
@@ -59,7 +59,7 @@
                 <form string="Stock Inventory Lines">
                     <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
-                    <field name="product_uom" groups="base.group_stock_uom"/>
+                    <field name="product_uom" groups="base.group_sale_uom_per_product"/>
                     <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
@@ -119,7 +119,7 @@
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom" groups="base.group_stock_uom"/>
+                                <field name="product_uom" groups="base.group_sale_uom_per_product"/>
                                 <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_stock_inventory_valuation"
@@ -131,7 +131,7 @@
                                 <newline/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom" groups="base.group_stock_uom"/>
+                                <field name="product_uom" groups="base.group_sale_uom_per_product"/>
                                 <group colspan="2" col="4">
                                 <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
@@ -145,7 +145,7 @@
                                 <tree string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                                     <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                                      <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize"
@@ -346,7 +346,7 @@
                                     <field name="partner_id"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                                     <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                                     <field name="date"/>
                                     <field name="prodlot_id"/>
@@ -425,7 +425,7 @@
                 <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
-                    <field name="product_uom"  string="UOM" groups="base.group_stock_uom"/>
+                    <field name="product_uom"  string="UOM" groups="base.group_sale_uom_per_product"/>
                     <field name="prodlot_id"  groups="base.group_stock_production_lot"/>
                     <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_stock_packaging"/>
@@ -449,7 +449,7 @@
                 <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
-                    <field name="product_uom"  string="UOM" groups="base.group_stock_uom"/>
+                    <field name="product_uom"  string="UOM" groups="base.group_sale_uom_per_product"/>
                     <field name="prodlot_id"  groups="base.group_stock_production_lot"/>
                     <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_stock_packaging"/>
@@ -712,7 +712,7 @@
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                                     <field name="product_uos" groups="product.group_uos"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -751,7 +751,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="base.group_stock_uom" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" groups="base.group_sale_uom_per_product" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -905,7 +905,7 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                                     <field name="product_uos" groups="product.group_uos"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -942,7 +942,7 @@
                                                 string="Scrap" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4" groups="base.group_stock_uom"/>
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4" groups="base.group_sale_uom_per_product"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
                                         <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
@@ -1126,7 +1126,7 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id" />
                                     <field name="product_qty" />
-                                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
@@ -1162,7 +1162,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="base.group_stock_uom" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" groups="base.group_sale_uom_per_product" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -1370,7 +1370,7 @@
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
@@ -1413,7 +1413,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="base.group_stock_uom"/>
+                        <field name="product_uom" string="Unit Of Measure" groups="base.group_sale_uom_per_product"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1544,7 +1544,7 @@
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
@@ -1583,7 +1583,7 @@
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UoM" groups="base.group_stock_uom"/>
+                    <field name="product_uom" string="UoM" groups="base.group_sale_uom_per_product"/>
                     <field name="date"/>
                     <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
@@ -1601,7 +1601,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="base.group_stock_uom"/>
+                        <field name="product_uom" string="Unit Of Measure" groups="base.group_sale_uom_per_product"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"