summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2016-08-30 16:06:05 +0200
committerNicolas Lempereur <nle@odoo.com>2016-08-30 16:15:32 +0200
commitb28cd9034e398feea28cc35bce2ea243dbb1d5cf (patch)
treedae97acf48d7667e9061a397b4a02fbf460e482c
parent7d7cb96c72ffd41273801c97bcbbe723a71181f4 (diff)
[FIX] stock: typo report picking operations
Number of columns may have not been equal to the number of columns headers which would cause an column mismatching since saas-11' 977d1ac. opw-687147
-rw-r--r--addons/stock/report/report_stockpicking_operations.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index c26ce3157d2..096582fb5cf 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -80,13 +80,14 @@
<br/>
<br/>
<table class="table table-condensed" t-if="o.pack_operation_ids">
+ <t t-set="has_barcode" t-value="any([pack_operation.product_id and pack_operation.product_id.barcode or pack_operation.package_id for pack_operation in o.pack_operation_ids])"/>
<t t-set="has_serial_number" t-value="o.pack_operation_ids.filtered('pack_lot_ids')" groups="stock.group_production_lot"/>
<thead>
<tr>
<th><strong>Product</strong></th>
<th class="text-right"><strong>Quantity</strong></th>
<t t-if="o.picking_type_id.code != 'incoming'"><th><strong>Source</strong></th></t>
- <th t-if="any([pack_operation.product_id and pack_operation.product_id.barcode or pack_operation.package_id for pack_operation in o.pack_operation_ids])" class="text-center">
+ <th t-if="has_barcode" class="text-center">
<strong>Barcode</strong>
</th>
<th t-if="has_serial_number">
@@ -106,7 +107,7 @@
<span t-field="pack_operation.package_id"/>
</td>
</t>
- <td>
+ <td t-if="has_barcode">
<span t-if="pack_operation.product_id and pack_operation.product_id.barcode">
<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', pack_operation.product_id.barcode, 600, 100)" style="width:300px;height:50px"/>
</span>