[FIX] Remove delivery amount from get_price. Else some codes use the delivery amount in the total to compute itself.
Eg: An order of 290$ wih delivery amount of 20$ --> Delivery free if getPrice>300$ -> Delivery = 0$ bzr revid: jke@openerp.com-20140130211649-0x9ryb3349vn7ubh
This commit is contained in:
parent
110f3dd910
commit
895088a91a
|
@ -192,7 +192,7 @@ class delivery_grid(osv.osv):
|
||||||
weight = 0
|
weight = 0
|
||||||
volume = 0
|
volume = 0
|
||||||
for line in order.order_line:
|
for line in order.order_line:
|
||||||
if not line.product_id:
|
if not line.product_id or line.is_delivery:
|
||||||
continue
|
continue
|
||||||
total += line.price_subtotal or 0.0
|
total += line.price_subtotal or 0.0
|
||||||
weight += (line.product_id.weight or 0.0) * line.product_uom_qty
|
weight += (line.product_id.weight or 0.0) * line.product_uom_qty
|
||||||
|
|
Loading…
Reference in New Issue