From 895088a91a350f048349f7d340c6c62b020280c8 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Thu, 30 Jan 2014 22:16:49 +0100
Subject: [PATCH] [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
---
 addons/delivery/delivery.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 7a288ac6f70..200e18b8e42 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -192,7 +192,7 @@ class delivery_grid(osv.osv):
         weight = 0
         volume = 0
         for line in order.order_line:
-            if not line.product_id:
+            if not line.product_id or line.is_delivery:
                 continue
             total += line.price_subtotal or 0.0
             weight += (line.product_id.weight or 0.0) * line.product_uom_qty