From f6cce022146199f2b63a6b773b2db326a93692b1 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 28 Nov 2013 14:30:28 +0100 Subject: [PATCH] [IMP] stock: internal picking report bzr revid: qdp-launchpad@openerp.com-20131128133028-2nhkp70qhom58hcn --- addons/stock/report/picking_internal.rml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/stock/report/picking_internal.rml b/addons/stock/report/picking_internal.rml index 3e04b5f3fe8..ba5754a93c9 100644 --- a/addons/stock/report/picking_internal.rml +++ b/addons/stock/report/picking_internal.rml @@ -134,7 +134,7 @@ - + Description @@ -152,7 +152,7 @@ Quantity - Barcode + Barcode @@ -168,7 +168,7 @@ - + Delivery Order : [[ (picking.picking_type_id.code == 'outgoing' or removeParentNode('para')) and '' ]] [[ picking.name ]] @@ -199,7 +199,7 @@ - + [[ picking.picking_type_id.name]] @@ -218,7 +218,7 @@ - + Description @@ -236,14 +236,14 @@ Quantity - Barcode + Barcode
[[ repeatIn([line for line in picking.move_lines if ((line.state == 'confirmed' or line.state=='done' or line.state=='assigned') and not line.scrapped)],'move_lines') ]] [[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]] - + [[ get_product_desc(move_lines) ]] @@ -263,7 +263,7 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] - [[ move_lines.product_id.ean13 ]] + [[ move_lines.product_id.ean13 or removeParentNode('barCode')]] @@ -273,7 +273,7 @@
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] [[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]] - + [[ get_product_desc(move_lines) ]] @@ -293,7 +293,7 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] - [[ move_lines.product_id.ean13 ]] + [[ move_lines.product_id.ean13 or removeParentNode('barCode')]]