From c3b847daa8622da7488ea61452ad7227390991dd Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 1 Sep 2015 15:57:41 +0200 Subject: [PATCH] [FIX] delivery: total passed to get_price_from_picking The total used to check which delivery.grid.line to apply must be in the currency of the company because the delivery.grid.line records with variable == Price are expressed in the currency of the company. opw:647799 --- addons/delivery/delivery.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index e8e2fe79ee8..2333877b8b5 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -223,6 +223,7 @@ class delivery_grid(osv.osv): quantity += q total = (order.amount_total or 0.0) - total_delivery + total = self.pool['res.currency'].compute(cr, uid, order.currency_id.id, order.company_id.currency_id.id, total, context=context) return self.get_price_from_picking(cr, uid, id, total,weight, volume, quantity, context=context) def get_price_from_picking(self, cr, uid, id, total, weight, volume, quantity, context=None):