diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-15 18:00:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-15 18:00:15 +0200 |
| commit | 0d69b6e47236eebdaa2c185becf45f1bb07edd1b (patch) | |
| tree | 04258a03810a0dc3faed46121d85de29fe94d494 | |
| parent | 0f6146ff2f339a8f77e368ade7de7d5f479c42ab (diff) | |
| parent | 6feb5f70e9069d5e221b6cf3a6e53fc12409ecee (diff) | |
[MERGE] forward port of branch saas-3 up to 6feb5f7
| -rw-r--r-- | addons/website_quote/views/website_quotation.xml | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml index 9e70f4cd65e..95e2af93811 100644 --- a/addons/website_quote/views/website_quotation.xml +++ b/addons/website_quote/views/website_quotation.xml @@ -211,14 +211,27 @@ </div> - <div class="text-center mb16" t-if="quotation.amount_undiscounted > quotation.amount_total"> + <div class="text-center mb16" t-if="quotation.amount_undiscounted > 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> |