From 10253a735f8296fbb42c311ebc36e2fe4bf1f135 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 27 Jun 2018 13:41:03 +0200
Subject: [PATCH] [FIX] sale: invoice template

- Activate the Sale option 'Tax-Included Prices'
- Create and print an invoice
  => the total is displayed on each line
- Activate the Sale option 'Sections on Sales Orders'
- Create and print an invoice
  => the total is NOT displayed on each line

The option 'Tax Display' only applies to SO, not to invoices. Moreover,
we make consistent the wording.

opw-1856623
---
 addons/sale/i18n/sale.pot                       | 5 +++++
 addons/sale/report/invoice_report_templates.xml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index b9064aabc9e..cf1dacf00c3 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -338,6 +338,11 @@ msgstr ""
 msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
+msgid "Amount"
+msgstr ""
+
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_crm_team_sales_to_invoice_amount
 msgid "Amount of sales to invoice"
diff --git a/addons/sale/report/invoice_report_templates.xml b/addons/sale/report/invoice_report_templates.xml
index 09beef6f8cc..4d3abdc152e 100644
--- a/addons/sale/report/invoice_report_templates.xml
+++ b/addons/sale/report/invoice_report_templates.xml
@@ -14,7 +14,7 @@
                         <th class="text-right">Unit Price</th>
                         <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
                         <th class="text-right">Taxes</th>
-                        <th class="text-right" groups="sale.group_show_price_subtotal">Price</th>
+                        <th class="text-right">Amount</th>
                     </tr>
                 </thead>
                 <tbody class="invoice_tbody">
@@ -45,7 +45,7 @@
                                 <td class="text-right">
                                     <span t-esc="', '.join(map(lambda x: x.description or x.name, l.invoice_line_tax_ids))"/>
                                 </td>
-                                <td class="text-right" groups="sale.group_show_price_subtotal">
+                                <td class="text-right">
                                     <span t-field="l.price_subtotal"
                                         t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                 </td>