From 7e298c86e6b8796849a93ff7d9532c170a24ce5a Mon Sep 17 00:00:00 2001
From: Mitali Patel <mpa@odoo.com>
Date: Wed, 12 Jun 2019 07:08:28 +0000
Subject: [PATCH] [IMP] sale(_management): remove the useless colspan

In e2e27b4 variable `colspan` and several `<t t-set="colspan"/>` were
removed replacing `t-att-colspan="colspan"` with `colspan="99"`.

but due to xpath behaviour reveted in commit https://github.com/odoo/odoo/commit/a540f7864af5fd46cc30ea8c99b2f404cbf58dd7
so now in master remove the useless colspan code.

task-2002587
closes: #34009
---
 addons/sale/report/sale_report_templates.xml           | 4 ----
 addons/sale/views/sale_portal_templates.xml            | 4 ----
 addons/sale_management/views/sale_portal_templates.xml | 2 --
 3 files changed, 10 deletions(-)

diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 57331c66300..8b4ff5e1ff3 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -66,15 +66,11 @@
             <table class="table table-sm o_main_table">
                 <thead>
                     <tr>
-                        <!-- TODO: remove in master -->
-                        <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>
-                            <!-- TODO: remove in master -->
-                            <t t-set="colspan" t-value="colspan+1"/>
                         </th>
                         <th class="text-right">Taxes</th>
                         <th class="text-right">
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 8cae1b0074c..a750b2c8c32 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -427,15 +427,11 @@
                 <table class="table table-sm" id="sales_order_table">
                     <thead class="bg-100">
                         <tr>
-                            <!-- TODO: remove in master -->
-                            <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>Disc.%</span>
-                                <!-- TODO: remove in master -->
-                                <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" >
diff --git a/addons/sale_management/views/sale_portal_templates.xml b/addons/sale_management/views/sale_portal_templates.xml
index ccbb69b8ac6..d22e79dd0f2 100644
--- a/addons/sale_management/views/sale_portal_templates.xml
+++ b/addons/sale_management/views/sale_portal_templates.xml
@@ -15,8 +15,6 @@
 
         <xpath expr="//section[@id='details']//table[@id='sales_order_table']/thead/tr" position="inside">
             <th t-if="display_remove">
-                <!-- TODO: remove in master -->
-                <t t-set="colspan" t-value="colspan+1"/>
             </th>
         </xpath>