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 @@
20
+
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: