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

[FIX] Use only published carrier_delivery 

bzr revid: jke@openerp.com-20140130212748-57udob0yxz73775r
This commit is contained in:
jke-openerp 2014-01-30 22:27:48 +01:00
parent d34abbf1cc
commit 1fb3cccef4
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,9 +56,6 @@ class SaleOrder(orm.Model):
),
}
def _add_delivery(self, cr, uid, order, context=None):
pass
def _get_website_data(self, cr, uid, order, context=None):
""" Override to add delivery-related website data. """
values = super(SaleOrder, self)._get_website_data(cr, uid, order, context=context)
@ -72,6 +69,6 @@ class SaleOrder(orm.Model):
delivery_ctx = dict(context, order_id=order.id)
DeliveryCarrier = self.pool.get('delivery.carrier')
delivery_ids = DeliveryCarrier.search(cr, uid, [], context=context)
delivery_ids = DeliveryCarrier.search(cr, uid, [('website_published','=',True)], context=context)
values['deliveries'] = DeliveryCarrier.browse(cr, SUPERUSER_ID, delivery_ids, context=delivery_ctx)
return values

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

@ -35,7 +35,7 @@ class Website(orm.Model):
if order.carrier_id:
self.pool['sale.order']._delivery_unset(cr, SUPERUSER_ID, order, context=context)
carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [], context=context)
carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('website_published','=',True)], context=context)
carrier_id = force_carrier_id or (carrier_ids and carrier_ids[0])
order.write({'carrier_id': carrier_id}, context=context)
#If carrier_id have no grid, we don't have delivery !