[MERGE] delivery: cleanup yml

[odoo/odoo.git] / addons / delivery / delivery_demo.xml

diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 8ec95f1..acc17e2 100644 (file)
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -6,20 +6,19 @@
 
         <record id="delivery_partner" model="res.partner">
             <field name="name">The Poste</field>
-            <field name="address" eval="[]"/>
         </record>
         <record id="delivery_partner_address" model="res.partner.address">
             <field name="type">default</field>
             <field name="partner_id" ref="delivery_partner"/>
         </record>
 
-        <!-- Create a partner -->
+        <!-- Create a service product -->
 
         <record id="delivery_product" model="product.product">
             <field name="name">Delivery by Poste</field>
             <field name="default_code">Delivery</field>
             <field name="type">service</field>
-            <field model="product.category" name="categ_id" search="[]"/>
+            <field name="categ_id" ref="product.product_category_services"/>
         </record>
 
         <!-- Carrier -->
@@ -30,12 +29,34 @@
             <field name="product_id" ref="delivery_product"/>
         </record>
 
+        <record id="free_delivery_carrier" model="delivery.carrier">
+            <field name="name">Free delivery charges</field>
+            <field name="free_if_more_than">True</field>
+            <field name="amount">1000</field>
+            <field name="partner_id" ref="delivery_partner"/>
+            <field name="product_id" ref="delivery_product"/>
+        </record>
+
+        <record id="normal_delivery_carrier" model="delivery.carrier">
+            <field name="name">normal delivery charges</field>
+            <field name="normal_price">10</field>
+            <field name="partner_id" ref="delivery_partner"/>
+            <field name="product_id" ref="delivery_product"/>
+        </record>
+        <record id="sale.order" model="sale.order">
+            <field name="carrier_id" ref="normal_delivery_carrier"/>
+        </record>
+        <record id="sale.order2" model="sale.order">
+            <field name="carrier_id" ref="free_delivery_carrier"/>
+        </record>
+
         <!-- Carrier Grids -->
 
         <record id="delivery_grid" model="delivery.grid">
             <field name="name">The Poste - Pricelist</field>
             <field name="carrier_id" ref="delivery_carrier"/>
         </record>
+        <!--  delivery charge of product if weight less than and equal 5kg-->
         <record id="delivery_grid_line1" model="delivery.grid.line">
             <field name="name">Weight &lt;= 5kg</field>
             <field name="grid_id" ref="delivery_grid"/>
@@ -43,6 +64,7 @@
             <field eval="20" name="list_price"/>
             <field eval="10" name="standard_price"/>
         </record>
+        <!--  delivery charge of product if weight more than 5kg-->
         <record id="delivery_grid_line2" model="delivery.grid.line">
             <field name="name">Weight &gt; 5kg</field>
             <field name="grid_id" ref="delivery_grid"/>
@@ -52,14 +74,15 @@
             <field eval="30" name="standard_price"/>
         </record>
 
+        <!--  free delivery charge if price more than 300-->
         <record id="delivery_grid_line3" model="delivery.grid.line">
             <field name="name">Free if price &gt;= 300</field>
             <field name="grid_id" ref="delivery_grid"/>
             <field eval="300" name="max_value"/>
             <field name="operator">&gt;=</field>
             <field name="type">price</field>
-            <field eval="10" name="list_price"/>
-            <field eval="20" name="standard_price"/>
+            <field eval="0" name="list_price"/>
+            <field eval="0" name="standard_price"/>
         </record>
     </data>
 </openerp>