diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 6348858b80c..d55ea205d82 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -72,9 +72,6 @@
                    <button string="Inventory" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations"/>
                    <button string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user"/>
                 </xpath>
-                <field name="list_price" position="after">
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </field>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">
                         <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
@@ -113,11 +110,16 @@
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
-                     <group name="store" string="Storage Location" attrs="{'invisible':[('type','=','service')]}">
-                         <field name="loc_rack"/>
-                         <field name="loc_row"/>
-                         <field name="loc_case"/>
-                     </group>
+                    <div>
+                        <separator string="Storage Location" attrs="{'invisible':[('type','=','service')]}"/>
+                        <separator string="Storage Location" groups="base.group_multi_company" attrs="{'invisible':[('type','!=','service')]}"/>
+                        <group name="store">
+                            <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>
+                    </div>
                 </group>
                 <group name="Weights" position="after">
                      <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">