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

[FIX] website_sale_delivery: don't raise (for the website customer) if they are no carrier; return true if they aren't need of carrier or if the carrier is good 

bzr revid: chm@openerp.com-20140124115723-nblyb3qknxym9817
This commit is contained in:
Christophe Matthieu 2014-01-24 12:57:23 +01:00
parent 33eeff4448
commit 6f859860e9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/website_sale_delivery/models/website.py
View File

@ -18,7 +18,7 @@ class Website(orm.Model):
context=context)
order = self.ecommerce_get_current_order(cr, uid, context=context)
return self._check_carrier_quotation(cr, uid, order, context=context) and quantity or None
def _check_carrier_quotation(self, cr, uid, order, context=None):
# check to add or remove carrier_id
carrier_id = False
@ -30,11 +30,14 @@ class Website(orm.Model):
if not carrier_id:
order.write({'carrier_id': None}, context=context)
self.pool['sale.order']._delivery_unset(cr, SUPERUSER_ID, order, context=context)
return None
return True
elif not order.carrier_id:
carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [], context=context)
order.write({'carrier_id': carrier_ids[0]}, context=context)
order.delivery_set(context=context)
return None
carrier_id = carrier_ids and carrier_ids[0]
order.write({'carrier_id': carrier_id}, context=context)
if carrier_id:
order.delivery_set(context=context)
else:
self.pool['sale.order']._delivery_unset(cr, SUPERUSER_ID, order, context=context)
return carrier_id
return bool(carrier_id)