From 0e403f8d8aa702b1111f56e2e750729d982ab8f2 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Wed, 5 Jun 2019 09:47:54 +0000
Subject: [PATCH] [FIX] website_sale_delivery: restore monetary widget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Odoo 11.0, fb5015d5fcea fixed some flows related to prices. By doing that,
the `t-options` dict was set on a variable to avoid code duplication.

But starting from Odoo 12.0, setting a variable on `t-options` attribute seems
to do nothing and is ignored.

This commit fix it by setting the price rather than the options on a variable.

Fixes #33451

closes odoo/odoo#33900

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 .../views/website_sale_delivery_templates.xml             | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 c8f29137cc2..286af2262aa 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -34,11 +34,9 @@
         <t t-set='badge_class' t-value="(delivery_nb != 1 and 'float-right ' or '') + 'badge badge-secondary'" />
         <t t-if="delivery.delivery_type == 'fixed'">
           <span t-if="delivery.fixed_price > 0.0" t-att-class="badge_class">
-            <t t-set="monetary_options" t-value='{"widget": "monetary",
-                                                   "from_currency": delivery.product_id.company_id.currency_id,
-                                                   "display_currency": website_sale_order.currency_id}'/>
-            <t t-if="delivery.free_over" t-esc="delivery.rate_shipment(website_sale_order)['price']" t-options='monetary_options'/>
-            <t t-else="" t-esc="delivery.fixed_price" t-options='monetary_options'/>
+            <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,
+                           "display_currency": website_sale_order.currency_id}'/>
           </span>
           <span t-else="" t-att-class="badge_class">Free</span>
         </t>