[MERGE] forward port of branch 8.0 up to 2b192be

[odoo/odoo.git] / addons / website_quote / views / website_quotation.xml

diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 41cf8ee..06a1266 100644 (file)
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -103,7 +103,7 @@
 
   <template id="change_quantity" inherit_id="website_quote.pricing" active="False" customize_show="True" name="Change Quantity">
       <xpath expr="//div[@id='quote_qty']" position="replace">
-          <div class="input-group">
+          <div class="input-group oe_website_spinner">
               <span class="input-group-addon hidden-print">
                   <a t-attf-href="./update_line/#{ line.id }/?order_id=#{ quotation.id }&amp;remove=True&amp;token=#{ quotation.access_token }" class="mb8 js_update_line_json">
                       <span class="fa fa-minus"/>
@@ -211,14 +211,27 @@
                               </div>
 
 
-                              <div class="text-center mb16" t-if="quotation.amount_undiscounted &gt; quotation.amount_total">
+                              <div class="text-center mb16" t-if="quotation.amount_undiscounted &gt; quotation.amount_untaxed">
                                   <p class="text-muted mb8">Your advantage:</p>
-                                  <strong t-field="quotation.amount_total" 
-                                        t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'/>
-                                  <strong t-field="quotation.amount_undiscounted"
-                                        t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'
-                                        style="text-decoration: line-through"
-                                        class="text-danger"/>
+                                  <t t-if="quotation.amount_untaxed == quotation.amount_total">
+                                      <strong t-field="quotation.amount_total"
+                                          t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'/>
+                                      <strong t-field="quotation.amount_undiscounted"
+                                          t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'
+                                          style="text-decoration: line-through"
+                                          class="text-danger"/>
+                                  </t>
+                                  <t t-if="quotation.amount_untaxed != quotation.amount_total">
+                                      <strong t-field="quotation.amount_untaxed"
+                                          t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'/>
+                                      <strong t-field="quotation.amount_undiscounted"
+                                          t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'
+                                          style="text-decoration: line-through"
+                                          class="text-danger"/>
+                                      <br />
+                                      (<span t-field="quotation.amount_total"
+                                          t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'/> Incl. tax)
+                                  </t>
                               </div>
                          </div>
                       </div>