From e2e27b41ad2b132595836f9b03ae9a25a4951c66 Mon Sep 17 00:00:00 2001
From: Julien Castiaux <juc@odoo.com>
Date: Wed, 27 Mar 2019 09:57:35 +0000
Subject: [PATCH] [FIX] sale: subtotal computation and display

Steps to reproduce:
- Install Accounting and Sale
- Enable the developer mode.
- Go to Settings > Users & Comp > Your user, edit to check both "Tax
Display B2B" and "Tax Display B2C" boxes.
- Go to Settings > General Settings > Accounting > Reporting, check the
"Add totals below sections" box.
- Create a sale order in the sale module, the sale order must have at
least one section with several products.
- Print the sale order. The subtotal amounts are wrong.

There are two different subtotals amount to compute, one for the
*Amount* column and one for the *Total Price*. The actual computation
did not store the two amount in different variables. Multiple template
are broken in the same way.

Fine tunning of 716ff76

Co-authored-by: Nans Lefevre <len@odoo.com>

opw-1950833

closes odoo/odoo#32148

Signed-off-by: Nans Lefebvre (len) <len@odoo.com>
---
 addons/account/views/report_invoice.xml      | 39 +++++++++++--------
 addons/sale/report/sale_report_templates.xml | 39 +++++++++++--------
 addons/sale/views/sale_portal_templates.xml  | 41 +++++++++++---------
 3 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index c32413a4f1d..1c57b6892c9 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -51,29 +51,26 @@
                     <table class="table table-sm o_main_table" name="invoice_line_table">
                         <thead>
                             <tr>
-                                <t t-set="colspan" t-value="6"/>
                                 <th class="text-left"><span>Description</span></th>
                                 <th class="d-none text-left"><span>Source Document</span></th>
                                 <th class="text-right"><span>Quantity</span></th>
                                 <th t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Unit Price</span></th>
                                 <th t-if="display_discount" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
                                     <span>Disc.(%)</span>
-                                    <t t-set="colspan" t-value="colspan+1"/>
                                 </th>
                                 <th t-attf-class="text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Taxes</span></th>
-                                <th class="text-right">
-                                    <span groups="account.group_show_line_subtotals_tax_excluded">Amount</span>
-                                    <span groups="account.group_show_line_subtotals_tax_included">Total Price</span>
-                                </th>
+                                <th class="text-right" groups="account.group_show_line_subtotals_tax_excluded">Amount</th>
+                                <th class="text-right" groups="account.group_show_line_subtotals_tax_included">Total Price</th>
                             </tr>
                         </thead>
                         <tbody class="invoice_tbody">
-                            <t t-set="current_subtotal" t-value="0"/>
+                            <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                            <t t-set="current_subtotal_tax_included" t-value="0"/>
 
                             <t t-foreach="o.invoice_line_ids" t-as="line">
 
-                                <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                                <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                                <t t-set="current_subtotal_tax_excluded" t-value="current_subtotal_tax_excluded + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                                <t t-set="current_subtotal_tax_included" t-value="current_subtotal_tax_included + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
 
                                 <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''">
                                     <t t-if="not line.display_type" name="account_invoice_line_accountable">
@@ -92,20 +89,23 @@
                                         <td t-attf-class="text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
                                             <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.invoice_line_tax_ids))"/>
                                         </td>
-                                        <td class="text-right o_price_total">
-                                            <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                                            <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                                        <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_excluded">
+                                            <span t-field="line.price_subtotal"/>
+                                        </td>
+                                        <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_included">
+                                            <span t-field="line.price_total"/>
                                         </td>
                                     </t>
                                     <t t-if="line.display_type == 'line_section'">
-                                        <td t-att-colspan="colspan">
+                                        <td colspan="99">
                                             <span t-field="line.name"/>
                                         </td>
                                         <t t-set="current_section" t-value="line"/>
-                                        <t t-set="current_subtotal" t-value="0"/>
+                                        <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                                        <t t-set="current_subtotal_tax_included" t-value="0"/>
                                     </t>
                                     <t t-if="line.display_type == 'line_note'">
-                                        <td t-att-colspan="colspan">
+                                        <td colspan="99">
                                             <span t-field="line.name"/>
                                         </td>
                                     </t>
@@ -113,12 +113,17 @@
 
                                 <t t-if="current_section and (line_last or o.invoice_line_ids[line_index+1].display_type == 'line_section')">
                                     <tr class="is-subtotal text-right">
-                                        <td t-att-colspan="colspan">
+                                        <td colspan="99">
                                             <strong class="mr16">Subtotal</strong>
                                             <span
-                                                t-esc="current_subtotal"
+                                                groups="account.group_show_line_subtotals_tax_excluded"
+                                                t-esc="current_subtotal_tax_excluded"
                                                 t-options='{"widget": "monetary", "display_currency": o.currency_id}'
                                             />
+                                            <span groups="account.group_show_line_subtotals_tax_included"> | <span
+                                                t-esc="current_subtotal_tax_included"
+                                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                            /></span>
                                         </td>
                                     </tr>
                                 </t>
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index edce182dcfc..28a5d105dfc 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -70,29 +70,26 @@
             <table class="table table-sm o_main_table">
                 <thead>
                     <tr>
-                        <t t-set="colspan" t-value="5"/>
                         <th class="text-left">Description</th>
                         <th class="text-right">Quantity</th>
                         <th class="text-right">Unit Price</th>
                         <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">
                             <span>Disc.(%)</span>
-                            <t t-set="colspan" t-value="colspan+1"/>
                         </th>
                         <th class="text-right">Taxes</th>
-                        <th class="text-right">
-                            <t groups="account.group_show_line_subtotals_tax_excluded">Amount</t>
-                            <t groups="account.group_show_line_subtotals_tax_included">Total Price</t>
-                        </th>
+                        <th class="text-right" groups="account.group_show_line_subtotals_tax_excluded">Amount</th>
+                        <th class="text-right" groups="account.group_show_line_subtotals_tax_included">Total Price</th>
                     </tr>
                 </thead>
                 <tbody class="sale_tbody">
 
-                    <t t-set="current_subtotal" t-value="0"/>
+                    <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                    <t t-set="current_subtotal_tax_included" t-value="0"/>
 
                     <t t-foreach="doc.order_line" t-as="line">
 
-                        <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                        <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                        <t t-set="current_subtotal_tax_excluded" t-value="current_subtotal_tax_excluded + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                        <t t-set="current_subtotal_tax_included" t-value="current_subtotal_tax_included + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
 
                         <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''">
                             <t t-if="not line.display_type">
@@ -110,20 +107,23 @@
                                 <td class="text-right">
                                     <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_id))"/>
                                 </td>
-                                <td class="text-right o_price_total">
-                                    <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                                    <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                                <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_excluded">
+                                    <span t-field="line.price_subtotal"/>
+                                </td>
+                                <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_included">
+                                    <span t-field="line.price_total"/>
                                 </td>
                             </t>
                             <t t-if="line.display_type == 'line_section'">
-                                <td t-att-colspan="99">
+                                <td colspan="99">
                                     <span t-field="line.name"/>
                                 </td>
                                 <t t-set="current_section" t-value="line"/>
-                                <t t-set="current_subtotal" t-value="0"/>
+                                <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                                <t t-set="current_subtotal_tax_included" t-value="0"/>
                             </t>
                             <t t-if="line.display_type == 'line_note'">
-                                <td t-att-colspan="99">
+                                <td colspan="99">
                                     <span t-field="line.name"/>
                                 </td>
                             </t>
@@ -131,12 +131,17 @@
 
                         <t t-if="current_section and (line_last or doc.order_line[line_index+1].display_type == 'line_section')">
                             <tr class="is-subtotal text-right">
-                                <td t-att-colspan="99">
+                                <td colspan="99" groups="account.group_show_line_subtotals_tax_excluded,account.group_show_line_subtotals_tax_included">
                                     <strong class="mr16">Subtotal</strong>
                                     <span
-                                        t-esc="current_subtotal"
+                                        groups="account.group_show_line_subtotals_tax_excluded"
+                                        t-esc="current_subtotal_tax_excluded"
                                         t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
                                     />
+                                    <span groups="account.group_show_line_subtotals_tax_included"> | <span
+                                        t-esc="current_subtotal_tax_included"
+                                        t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
+                                    /></span>
                                 </td>
                             </tr>
                         </t>
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index e91882591d2..40bd6c27414 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -428,29 +428,26 @@
                 <table class="table table-sm" id="sales_order_table">
                     <thead class="bg-100">
                         <tr>
-                            <t t-set="colspan" t-value="6"/>
                             <th class="text-left">Products</th>
                             <th class="text-right">Quantity</th>
                             <th t-attf-class="text-right {{ 'd-none d-sm-table-cell' if report_type == 'html' else '' }}">Unit Price</th>
                             <th t-if="display_discount" t-attf-class="text-right {{ 'd-none d-sm-table-cell' if report_type == 'html' else '' }}">
                                 <span>Discount</span>
-                                <t t-set="colspan" t-value="colspan+1"/>
                             </th>
                             <th t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">Taxes</th>
-                            <th class="text-right" >
-                                <span groups="account.group_show_line_subtotals_tax_excluded">Amount</span>
-                                <span groups="account.group_show_line_subtotals_tax_included">Total Price</span>
-                            </th>
+                            <th class="text-right" groups="account.group_show_line_subtotals_tax_excluded">Amount</th>
+                            <th class="text-right" groups="account.group_show_line_subtotals_tax_included">Total Price</th>
                         </tr>
                     </thead>
                     <tbody class="sale_tbody">
 
-                        <t t-set="current_subtotal" t-value="0"/>
+                        <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                        <t t-set="current_subtotal_tax_included" t-value="0"/>
 
                         <t t-foreach="sale_order.order_line" t-as="line">
 
-                            <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                            <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                            <t t-set="current_subtotal_tax_excluded" t-value="current_subtotal_tax_excluded + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                            <t t-set="current_subtotal_tax_included" t-value="current_subtotal_tax_included + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
 
                             <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''">
                                 <t t-if="not line.display_type">
@@ -481,20 +478,23 @@
                                     <td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
                                         <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_id))"/>
                                     </td>
-                                    <td class="text-right">
-                                        <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
-                                        <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                                    <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_excluded">
+                                        <span t-field="line.price_subtotal"/>
+                                    </td>
+                                    <td class="text-right o_price_total" groups="account.group_show_line_subtotals_tax_included">
+                                        <span t-field="line.price_total"/>
                                     </td>
                                 </t>
                                 <t t-if="line.display_type == 'line_section'">
-                                    <td t-att-colspan="colspan">
+                                    <td colspan="99">
                                         <span t-field="line.name"/>
                                     </td>
                                     <t t-set="current_section" t-value="line"/>
-                                    <t t-set="current_subtotal" t-value="0"/>
+                                    <t t-set="current_subtotal_tax_excluded" t-value="0"/>
+                                    <t t-set="current_subtotal_tax_included" t-value="0"/>
                                 </t>
                                 <t t-if="line.display_type == 'line_note'">
-                                    <td t-att-colspan="colspan">
+                                    <td colspan="99">
                                         <span t-field="line.name"/>
                                     </td>
                                 </t>
@@ -502,12 +502,17 @@
 
                             <t t-if="current_section and (line_last or sale_order.order_line[line_index+1].display_type == 'line_section')">
                                 <tr class="is-subtotal text-right">
-                                    <td t-att-colspan="colspan">
+                                    <td colspan="99">
                                         <strong class="mr16">Subtotal</strong>
                                         <span
-                                            t-esc="current_subtotal"
-                                            t-options='{"widget": "monetary", "display_currency": sale_order.pricelist_id.currency_id}'
+                                            groups="account.group_show_line_subtotals_tax_excluded"
+                                            t-esc="current_subtotal_tax_excluded"
+                                            t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
                                         />
+                                        <span groups="account.group_show_line_subtotals_tax_included"> | <span
+                                            t-esc="current_subtotal_tax_included"
+                                            t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
+                                        /></span>
                                     </td>
                                 </tr>
                             </t>