From 451a79ab2a351f4d2bddc3a4752bf44ab4f3dfbf Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 19 Sep 2016 17:49:17 +0200
Subject: [PATCH] [FIX] website_sale*: use website_price instead of price

---
 addons/website_sale/views/templates.xml                | 10 +++++-----
 .../views/website_sale_options_templates.xml           |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 982f321a686..1d97c1b3643 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -106,8 +106,8 @@
                                 <del class="text-danger mr8" style="white-space: nowrap;" t-esc="compute_currency(product.website_public_price)" t-options="{'widget': 'monetary', 'display_currency': website.get_current_pricelist().currency_id, 'from_currency': website.currency_id}" />
                             </t>
 
-                            <span t-esc="product.website_price" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}" />
-                            <span itemprop="price" style="display:none;" t-esc="product.price" />
+                            <span t-esc="product.website_price" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
+                            <span itemprop="price" style="display:none;" t-esc="product.website_price" />
                             <span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name" />
                         </b>
                     </div>
@@ -569,7 +569,7 @@
                 t-esc="compute_currency(product.website_public_price)" t-options="{'widget': 'monetary', 'display_currency': website.get_current_pricelist().currency_id, 'from_currency': website.currency_id}" t-att-style="'text-decoration: line-through; white-space: nowrap; ' + '' if (compute_currency(product.lst_price) - product.website_price) &gt; 0.01 and website.get_current_pricelist().discount_policy == 'without_discount' else 'display: none;'"
               />
               <b class="oe_price" style="white-space: nowrap;" t-esc="product.website_price" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
-              <span itemprop="price" style="display:none;" t-esc="product.price"/>
+              <span itemprop="price" style="display:none;" t-esc="product.website_price"/>
               <span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name"/>
           </h4>
           <h4 class="css_non_editable_mode_hidden">
@@ -972,10 +972,10 @@
                             <div class="text-muted" t-field="product.description_sale" />
                         </td>
                         <td>
-                            <t t-if="(compute_currency(product.lst_price) - product.price) &gt; 0.1  and website.get_current_pricelist().discount_policy=='without_discount'">
+                            <t t-if="(compute_currency(product.lst_price) - product.website_price) &gt; 0.01  and website.get_current_pricelist().discount_policy=='without_discount'">
                                 <del class="text-danger mr8" style="white-space: nowrap;" t-field="product.lst_price" t-options="{'widget': 'monetary','from_currency': product.currency_id, 'display_currency': website.currency_id}" />
                             </t>
-                            <span t-field="product.price" style="white-space: nowrap;" t-options="{'widget': 'monetary','display_currency': website.currency_id}" />
+                            <span t-field="product.website_price" style="white-space: nowrap;" t-options="{'widget': 'monetary','display_currency': website.currency_id}" />
                         </td>
                         <td class="text-center">
                             <input class="js_quantity" name="product_id" t-att-data-product-id="product.id" type="hidden" />
diff --git a/addons/website_sale_options/views/website_sale_options_templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml
index 1ca3f518cf0..11172d947fe 100644
--- a/addons/website_sale_options/views/website_sale_options_templates.xml
+++ b/addons/website_sale_options/views/website_sale_options_templates.xml
@@ -54,7 +54,7 @@
                   </div>
                 </td>
                 <td>
-                  <span t-attf-class="text-danger oe_default_price" t-att-style="'' if (compute_currency(product.lst_price) - product.price) &gt; 0.1 else 'display: none;'" style="text-decoration: line-through; white-space: nowrap;"
+                  <span t-attf-class="text-danger oe_default_price" t-att-style="'text-decoration: line-through; white-space: nowrap;' + '' if (compute_currency(product.lst_price) - product.with_context(quantity=1).website_price ) &gt; 0.01 else 'display: none;'"
                     t-field="product.lst_price"
                     t-options='{
                       "widget": "monetary",
@@ -101,15 +101,15 @@
                   </div>
                 </td>
                 <td>
-                  <span class="text-danger oe_optional" t-att-style="'' if (compute_currency(product.lst_price) - product.price) &gt; 0.1 else 'display: none;'" style="text-decoration: line-through; white-space: nowrap;"
+                  <span class="text-danger oe_default_price oe_optional"
                     t-field="product.lst_price"
                     t-options='{
                       "widget": "monetary",
                       "from_currency": product.currency_id,
                       "display_currency": website.currency_id
-                   }'/><br/>
+                   }'/>
                   <span class="oe_price" style="white-space: nowrap;"
-                    t-field="product.price"
+                    t-field="product.website_price"
                     t-options='{
                        "widget": "monetary",
                        "display_currency": website.currency_id