From 45ca8f41d6efa044291a933ea00f7e0de08e3948 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Wed, 19 Jul 2017 13:28:18 +0200
Subject: [REF] delivery: remove inherits with product.product

(Actually, a good old m2o is enough.)

We also clean a bit the delivery.carrier view.
---
 addons/delivery/data/delivery_data.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'addons/delivery/data/delivery_data.xml')

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>
-- 
cgit v1.2.3