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

[FIX] delivery: delivery_set returns a result 

The delivery_set() method has no return statement.
Calling this method through xmlrpc produce an error since None is not valid.

Closes #1033
This commit is contained in:
Robin Lucbernet 2015-06-25 12:00:49 +02:00 committed by Denis Ledoux
parent 384b60b3c7
commit 8ab6865849
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/delivery/sale.py
View File

@ -66,6 +66,7 @@ class sale_order(osv.Model):
acc_fp_obj = self.pool.get('account.fiscal.position')
self._delivery_unset(cr, uid, ids, context=context)
currency_obj = self.pool.get('res.currency')
line_ids = []
for order in self.browse(cr, uid, ids, context=context):
grid_id = carrier_obj.grid_get(cr, uid, [order.carrier_id.id], order.partner_shipping_id.id)
if not grid_id:
@ -84,7 +85,7 @@ class sale_order(osv.Model):
price_unit = currency_obj.compute(cr, uid, order.company_id.currency_id.id, order.pricelist_id.currency_id.id,
price_unit, context=dict(context or {}, date=order.date_order))
#create the sale order line
line_obj.create(cr, uid, {
line_id = line_obj.create(cr, uid, {
'order_id': order.id,
'name': grid.carrier_id.name,
'product_uom_qty': 1,
@ -94,3 +95,5 @@ class sale_order(osv.Model):
'tax_id': [(6, 0, taxes_ids)],
'is_delivery': True
}, context=context)
line_ids.append(line_id)
return line_ids