From f1204ee9c3327985c6a2337c1948843435d965a2 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Thu, 30 Jan 2014 22:49:44 +0100
Subject: [PATCH] [FIX] Fix bug with demo data from delivery module. We create
 a grid, but without specify to "use_detailed_pricelist"

bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
---
 addons/delivery/delivery.py                      | 4 ++--
 addons/delivery/delivery_demo.xml                | 1 +
 addons/website_sale_delivery/controllers/main.py | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 200e18b8e42..8f474461cf7 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -204,7 +204,7 @@ class delivery_grid(osv.osv):
     def get_price_from_picking(self, cr, uid, id, total, weight, volume, context=None):
         grid = self.browse(cr, uid, id, context=context)
         price = 0.0
-        ok = False        
+        ok = False
         price_dict = {'price': total, 'volume':volume, 'weight': weight, 'wv':volume*weight}
         for line in grid.line_ids:
             test = eval(line.type+line.operator+str(line.max_value), price_dict)
@@ -215,7 +215,7 @@ class delivery_grid(osv.osv):
                     price = line.list_price
                 ok = True
                 break
-        if not ok:            
+        if not ok:
             raise osv.except_osv(_('No price available!'), _('No line matched this product or order in the chosen delivery grid.'))
 
         return price
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 0aed1a2aadd..f090947d57f 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -35,6 +35,7 @@
             <field name="normal_price">20</field>
             <field name="partner_id" ref="res_partner_23"/>
             <field name="product_id" ref="product_product_delivery"/>
+            <field name="use_detailed_pricelist" eval="True"/>
         </record>
 
         <record id="free_delivery_carrier" model="delivery.carrier">
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 5928bf0aca3..73da87b549d 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -11,7 +11,6 @@ class Ecommerce(Ecommerce):
     def payment(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         order = self.get_order()
-
         carrier_id = post.get('carrier_id')
 
         if order and carrier_id: