From eadcfaeb57cf30ba976bec9f0048881b2f08c2d4 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 22 Apr 2020 07:48:46 +0000
Subject: [PATCH] [FIX] website_sale_delivery: Wrong shipping price displayed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce the bug:

- Let's consider a company C in €
- Let's consider two selectable pricelists P1 in € and P2 in $
- The € rate is 1.0 and the $ rate is 0.5
- Configure a shipping method SM with a fixed price of 100€ and free if the price is
above 1000€.
- Configure a free delivery product P with sales price = 100€
- Go to the shop with P2 as pricelist and add in the cart any product which price is less
than 1000€ (in this case 500$)
- Process your order until the check out

Bug:

The price of SM was 25$ instead of 50$ because the function rate_shipment already computed
the price in the right currency

opw:2239117

closes odoo/odoo#49987

X-original-commit: 68b08164e5de353ea0c48de92d0c0e028b49bc52
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
 .../views/website_sale_delivery_templates.xml                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index d685d18ca09..42abbc7bdf9 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -36,7 +36,7 @@
           <span t-if="delivery.fixed_price > 0.0" t-att-class="badge_class">
             <t t-esc="delivery.rate_shipment(website_sale_order)['price'] if delivery.free_over else delivery.fixed_price"
                t-options='{"widget": "monetary",
-                           "from_currency": delivery.product_id.company_id.currency_id or website_sale_order.company_id.currency_id,
+                           "from_currency": website_sale_order.currency_id if delivery.free_over else delivery.product_id.company_id.currency_id or website_sale_order.company_id.currency_id,
                            "display_currency": website_sale_order.currency_id}'/>
           </span>
           <span t-else="" t-att-class="badge_class">Free</span>