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

Merge pull request #203 from buke/7.0 

[FIX] delivery: when computing the weight and volume, use the quantity converted to the product uom instead of the uom of the purchase order.
This commit is contained in:
Martin Trigaux 2014-05-26 17:07:14 +02:00
parent c4d63fe364 1971141dc5
commit 8b546d20ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/delivery/delivery.py
View File

@ -192,13 +192,14 @@ class delivery_grid(osv.osv):
total = 0
weight = 0
volume = 0
product_uom_obj = self.pool.get('product.uom')
for line in order.order_line:
if not line.product_id:
continue
q = product_uom_obj._compute_qty(cr, uid, line.product_uom.id, line.product_uos_qty, line.product_id.uom_id.id)
total += line.price_subtotal or 0.0
weight += (line.product_id.weight or 0.0) * line.product_uom_qty
volume += (line.product_id.volume or 0.0) * line.product_uom_qty
weight += (line.product_id.weight or 0.0) * q
volume += (line.product_id.volume or 0.0) * q
return self.get_price_from_picking(cr, uid, id, total,weight, volume, context=context)