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

[IMP] Stock: minor report layout issues: delivery order / picking list

Browse Source 
[FIX] ORM: crash in group by (example: pipeline analysis -> graph)
This commit is contained in:
Fabien Pinckaers
2016-04-08 13:14:08 -07:00
parent 7a6f2093e8
commit ec12e529c8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/product_view.xml
+1 -1
View File
@@ -805,7 +805,7 @@
<field name="name">product.supplierinfo.search.view</field>
<field name="model">product.supplierinfo</field>
<field name="arch" type="xml">
<search string="Vendor Information">
<search string="Vendor">
<field name="name"/>
<field name="product_tmpl_id"/>
</search>
addons/stock/views/report_stockpicking_operations.xml
+2 -2
View File
@@ -8,7 +8,7 @@
</template>
<template id="external_layout_header_barcode_right" inherit_id="report.external_layout_header" primary="True">
<xpath expr="//div[@name='company_address']" position="after">
<div class="col-xs-4 pull-right" name="right_box">
<div class="col-xs-4 pull-right mt8" name="right_box">
<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px;"/>
</div>
</xpath>
@@ -86,7 +86,7 @@
<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])">
<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">
<strong>Barcode</strong>
</th>
<th t-if="has_serial_number">
openerp/models.py
+1 -1
View File
@@ -2172,7 +2172,7 @@ class BaseModel(object):
# (range, label) by just the formatted label, in-place
for group in result:
for df in dt:
if df in group:
if group.get(df, False) and (len(group[df])>1):
group[df] = group[df][1]
return result