diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index a70610f9311..5a90c20aa81 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -6,20 +6,20 @@
   -->
 
     <record id="view_partner_property_form" model="ir.ui.view">
-      <field name="name">res.partner.stock.property.form.inherit</field>
-      <field name="model">res.partner</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.view_partner_form"/>
-      <field name="arch" type="xml">
-        <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="2" col="2" groups="stock.group_inventory_properties">
-            <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="stock.group_inventory_properties" />
-            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="stock.group_inventory_properties"/>
-          </group>
-        </page>
-      </field>
+        <field name="name">res.partner.stock.property.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <page string="Sales &amp; Purchases" position="inside">
+                <group colspan="2" col="2" groups="stock.group_locations">
+                    <separator string="Inventory Properties" colspan="2"/>
+                    <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
+                    <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+                </group>
+            </page>
+        </field>
     </record>
 
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 8ac755af498..19533933002 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                 <page position="after" string="Information">
+                <page position="after" string="Information">
                     <page string="Properties">
-                        <separator string="Counter-Part Locations Properties" groups="stock.group_counterpart_location" colspan="4"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]" groups="stock.group_counterpart_location"/>
-                        <field name="property_stock_production" domain="[('usage','=','production')]" groups="stock.group_counterpart_location"/>
-                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]" groups="stock.group_counterpart_location"/>
+                        <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')]"/>
@@ -79,7 +79,7 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
-                    <group groups="base.group_extended">
+                    <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
@@ -169,7 +169,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="stock.group_counterpart_location">
+                    <group col="2" colspan="2" name="store" groups="stock.group_locations">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 2cd0bc510a0..7a887192ff7 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -72,12 +72,10 @@ class stock_config_settings(osv.osv_memory):
         'group_stock_inventory_valuation': fields.boolean("Accounting Entries per Stock Movement",
             implied_group='stock.group_inventory_valuation',
             help="""This allows to split stock inventory lines according to production lots."""),
-        'group_stock_counterpart_location': fields.boolean("Manage your stock counterpart by products",
-            implied_group='stock.group_counterpart_location',
-            help="""This allows to use different stock locations instead of the default one for procurement, production and inventory."""),
-        'group_stock_inventory_properties': fields.boolean("Define stock locations",
-            implied_group='stock.group_inventory_properties',
-            help="""This allows you to set destination location for goods you send to partner, or goods you receive from the current partner."""),
+        'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
+            implied_group='stock.group_locations',
+            help="""This allows to configure and use multiple stock locations and warehouses,
+                instead of having a single default one."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 7ff8dfe624a..eac77abedf6 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -16,11 +16,10 @@
                     <field name="group_stock_tracking_lot"/>
 
                     <separator string="Logistics" colspan="4"/>
+                    <field name="group_stock_multiple_locations"/>
                     <field name="module_stock_no_autopicking"/>
-                    <field name="module_stock_invoice_directly"/>
                     <field name="module_stock_location"/>
-                    <field name="group_stock_counterpart_location"/>
-                    <field name="group_stock_inventory_properties"/>
+                    <field name="module_stock_invoice_directly"/>
 
                     <separator string="Products" colspan="4"/>
                     <field name="group_stock_packaging"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 11a0acc02d0..6367ed8668f 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -27,13 +27,8 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_counterpart_location" model="res.groups">
-        <field name="name">Manage Counter-Part Locations</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="group_inventory_properties" model="res.groups">
-        <field name="name">Manage Inventory properties in partner form</field>
+    <record id="group_locations" model="res.groups">
+        <field name="name">Manage Multiple Locations and Warehouses</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>