diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
index 958b4b7f6d6..1d7cb404df6 100644
--- a/addons/product_price_unit/product_price_unit_view.xml
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -30,21 +30,15 @@
             </field>
         </record>
         
-        <record id="view_category_property_form" model="ir.ui.view">
+        <record id="view_category_property_form_price_unit" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="inherit_id" ref="stock.view_category_property_form"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group col="2" colspan="2">
-                        <separator string="Accounting Stock Properties" colspan="2"/>
-                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_journal"/>
-                        <field name="property_stock_location" domain="[('usage','=','internal')]"/>
-                    </group>
-                </form>
+                <field name="property_stock_journal" position="after">
+                    <field name="property_stock_location" domain="[('usage','=','internal')]"/>
+                </field>
             </field>
         </record>
         
@@ -52,7 +46,7 @@
             <field name="name">product.category.stock.allow_negative.form.inherit</field>
             <field name="model">product.category</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="view_category_property_form"/>
+            <field name="inherit_id" ref="view_category_property_form_price_unit"/>
             <field name="arch" type="xml">
                 <field name="sequence" position="after">
                   <field name="allow_negative_stock" />
@@ -60,21 +54,15 @@
             </field>
         </record>
         
-        <record id="view_normal_property_form" model="ir.ui.view">
+        <record id="view_normal_property_form_price_unit" model="ir.ui.view">
             <field name="name">product.normal.stock.property.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_property_form"/>
             <field name="arch" type="xml">
-                <group name="store" position="replace">
-                    <group col="2" colspan="2" name="store">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" widget="selection"/>
-                        <field name="property_stock_inventory" widget="selection"/>
-                        <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
-                    </group>
-                </group>
+	           <field name="property_stock_inventory" position="after">
+	               <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
+	           </field>
             </field>
         </record>
         
@@ -82,7 +70,7 @@
             <field name="name">product.normal.stock.allow_negative.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="view_normal_property_form"/>
+            <field name="inherit_id" ref="view_normal_property_form_price_unit"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                   <field name="allow_negative_stock" />