[REF] delivery: remove inherits with product.product

(Actually, a good old m2o is enough.)

We also clean a bit the delivery.carrier view.

2 files changed, 35 insertions, 14 deletions

diff --git a/addons/delivery/data/delivery_data.xml b/addons/delivery/data/delivery_data.xml
index 24bf8d0866f..c84a7e16297 100644
--- a/addons/delivery/data/delivery_data.xml
+++ b/addons/delivery/data/delivery_data.xml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-
+        <record id="product_product_delivery" model="product.product">
+            <field name="name">Free delivery charges</field>
+            <field name="default_code">Delivery</field>
+            <field name="type">service</field>
+            <field name="categ_id" ref="product.product_category_all"/>
+            <field name="sale_ok" eval="False"/>
+            <field name="purchase_ok" eval="False"/>
+            <field name="list_price">0.0</field>
+        </record>
         <record id="free_delivery_carrier" model="delivery.carrier">
             <field name="name">Free delivery charges</field>
-            <field name="fixed_price">0</field>
+            <field name="fixed_price">0.0</field>
             <field name="free_over" eval="True"/>
             <field name="amount">1000</field>
             <field name="sequence">1</field>
             <field name="delivery_type">fixed</field>
-            <field name="product_type">service</field>
-            <field name="product_sale_ok" eval="False"/>
+            <field name="product_id" ref="delivery.product_product_delivery"/>
         </record>
-
     </data>
 </odoo>
diff --git a/addons/delivery/data/delivery_demo.xml b/addons/delivery/data/delivery_demo.xml
index 40c19d755f5..8249330a209 100644
--- a/addons/delivery/data/delivery_demo.xml
+++ b/addons/delivery/data/delivery_demo.xml
@@ -4,29 +4,46 @@
 
         <!-- Carrier -->
 
+        <record id="product_product_delivery_poste" model="product.product">
+            <field name="name">The Poste</field>
+            <field name="default_code">Delivery</field>
+            <field name="type">service</field>
+            <field name="categ_id" ref="product.product_category_all"/>
+            <field name="sale_ok" eval="False"/>
+            <field name="purchase_ok" eval="False"/>
+            <field name="list_price">20.0</field>
+        </record>
+
         <record id="delivery_carrier" model="delivery.carrier">
             <field name="name">The Poste</field>
-            <field name="fixed_price">20</field>
+            <field name="fixed_price">20.0</field>
             <field name="sequence">2</field>
             <field name="delivery_type">base_on_rule</field>
-            <field name="product_type">service</field>
-            <field name="product_sale_ok" eval="False"/>
+            <field name="product_id" ref="delivery.product_product_delivery_poste"/>
+        </record>
+
+        <record id="product_product_delivery_normal" model="product.product">
+            <field name="name">Normal Delivery Charges</field>
+            <field name="default_code">Delivery</field>
+            <field name="type">service</field>
+            <field name="categ_id" ref="product.product_category_all"/>
+            <field name="sale_ok" eval="False"/>
+            <field name="purchase_ok" eval="False"/>
+            <field name="list_price">10.0</field>
         </record>
 
         <record id="normal_delivery_carrier" model="delivery.carrier">
             <field name="name">Normal Delivery Charges</field>
-            <field name="fixed_price">10</field>
+            <field name="fixed_price">10.0</field>
             <field name="sequence">3</field>
             <field name="delivery_type">fixed</field>
-            <field name="product_type">service</field>
-            <field name="product_sale_ok" eval="False"/>
+            <field name="product_id" ref="delivery.product_product_delivery_normal"/>
         </record>
 
         <record id="delivery_price_rule1" model="delivery.price.rule">
             <field name="carrier_id" ref="delivery_carrier"/>
             <field eval="5" name="max_value"/>
             <field eval="20" name="list_base_price"/>
-            <field eval="10" name="standard_price"/>
         </record>
         <!--  delivery charge of product if weight more than 5kg-->
         <record id="delivery_price_rule2" model="delivery.price.rule">
@@ -34,7 +51,6 @@
             <field name="operator">&gt;=</field>
             <field eval="5" name="max_value"/>
             <field eval="50" name="list_base_price"/>
-            <field eval="30" name="standard_price"/>
         </record>
 
         <!--  free delivery charge if price more than 300-->
@@ -44,7 +60,6 @@
             <field name="operator">&gt;=</field>
             <field name="variable">price</field>
             <field eval="0" name="list_base_price"/>
-            <field eval="0" name="standard_price"/>
         </record>
 
         <record forcecreate="True" id="property_delivery_carrier" model="ir.property">