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

[FIX] stock: missing quantity parameter from get_price_from_picking

This commit is contained in:
Max Mumford 2014-08-27 17:13:14 +02:00 committed by Denis Ledoux
parent 46c71cd18d
commit d662aeaa27
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/delivery/stock.py
View File

@ -91,9 +91,10 @@ class stock_picking(osv.osv):
_('The carrier %s (id: %d) has no delivery grid!') \
% (picking.carrier_id.name,
picking.carrier_id.id))
quantity = sum([line.product_uom_qty for line in picking.move_lines])
price = grid_obj.get_price_from_picking(cr, uid, grid_id,
invoice.amount_untaxed, picking.weight, picking.volume,
context=context)
quantity, context=context)
account_id = picking.carrier_id.product_id.property_account_income.id
if not account_id:
account_id = picking.carrier_id.product_id.categ_id\