merge

sale.xml

@@ -758,14 +758,14 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <record model="ir.ui.view" id="product_view_form">
-            <field name="model">product.product</field>
-            <field name="inherit" ref="product.product_view_form"/>
+        <record model="ir.ui.view" id="template_view_form">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_form"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <data>
-                    <xpath expr="/form/notebook/page/separator[@name=&quot;description&quot;]"
-                        position="before">
+                    <xpath expr="/form/notebook/page[@string=&quot;General&quot;]/field[@name=&quot;cost_price_method&quot;]"
+                        position="after">
                         <label name="salable"/>
                         <field name="salable"/>
                     </xpath>
@@ -783,9 +783,9 @@
                 ]]>
             </field>
         </record>
-        <record model="ir.ui.view" id="product_view_tree">
-            <field name="model">product.product</field>
-            <field name="inherit" ref="product.product_view_tree"/>
+        <record model="ir.ui.view" id="template_view_tree">
+            <field name="model">product.template</field>
+            <field name="inherit" ref="product.template_view_tree"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <data>