pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] sale(_management): remove the useless colspan

Browse Source 
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
This commit is contained in:
Mitali Patel
2019-06-24 09:15:27 +00:00
parent eadb4f70fb
commit 7e298c86e6
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/report/sale_report_templates.xml
-4
View File
@@ -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">
addons/sale/views/sale_portal_templates.xml
-4
View File
@@ -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" >
addons/sale_management/views/sale_portal_templates.xml
-2
View File
@@ -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>