odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] website_sale_delivery: list pop actually takes as arg the index in the list, not the item (+ check that carrier id is not false) 

bzr revid: dle@openerp.com-20140404130302-mvm2tzhsc2a58p11
This commit is contained in:
Denis Ledoux 2014-04-04 15:03:02 +02:00
parent 5759df7bef
commit 3b821e0854
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/website_sale_delivery/models/sale_order.py
View File

@ -69,10 +69,12 @@ class SaleOrder(orm.Model):
else:
carrier_id = force_carrier_id or order.carrier_id.id
carrier_ids = self._get_delivery_methods(cr, uid, order, context=context)
if carrier_id not in carrier_ids:
carrier_id = False
else:
carrier_ids.insert(0, carrier_ids.pop(carrier_id))
if carrier_id:
if carrier_id not in carrier_ids:
carrier_id = False
else:
carrier_ids.remove(carrier_id)
carrier_ids.insert(0, carrier_id)
if force_carrier_id or not carrier_id or not carrier_id in carrier_ids:
for delivery_id in carrier_ids:
grid_id = carrier_obj.grid_get(cr, SUPERUSER_ID, [delivery_id], order.partner_shipping_id.id)