Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
This commit is contained in:
@@ -151,7 +151,7 @@ class QualityCheck(models.Model):
|
|||||||
if record.picking_id:
|
if record.picking_id:
|
||||||
total_qty = 0
|
total_qty = 0
|
||||||
for move in record.picking_id.move_ids_without_package:
|
for move in record.picking_id.move_ids_without_package:
|
||||||
total_qty += move.quantity_done
|
total_qty += move.product_uom_qty
|
||||||
record.total_qty = total_qty if total_qty > 0 else ''
|
record.total_qty = total_qty if total_qty > 0 else ''
|
||||||
else:
|
else:
|
||||||
record.total_qty = ''
|
record.total_qty = ''
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<!-- 使用公开访问URL的二维码 -->
|
<!-- 使用公开访问URL的二维码 -->
|
||||||
<img t-att-src="'/report/barcode/QR/%s?width=100&height=100' % o.get_report_url()" style="width:80px;height:80px"/>
|
<img t-att-src="'/report/barcode/QR/%s?width=100&height=100' % o.get_report_url()" style="width:80px;height:80px"/>
|
||||||
<div style="font-size: 14px;">
|
<div style="font-size: 14px;">
|
||||||
<strong>报告编号: </strong><span t-field="o.name"/>
|
<strong>报告编号: </strong><span t-if="o.report_number_id" t-field="o.report_number_id"/> <span t-else="">ceshi</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- 添加扫码提示 -->
|
<!-- 添加扫码提示 -->
|
||||||
<div style="font-size: 12px;">
|
<div style="font-size: 12px;">
|
||||||
|
|||||||
Reference in New Issue
Block a user