diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 512d124ee0c..d9d306caefb 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -36,5 +36,5 @@ class picking(report_sxw.rml_parse): desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc return desc -report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking) +report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking, header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 0a17f56fc71..38dc7992a5d 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -66,6 +66,7 @@ + @@ -75,6 +76,7 @@ + @@ -84,6 +86,7 @@ + @@ -156,24 +159,6 @@ - - - - Supplier Address : [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] - Customer Address : [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] - Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] - [[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]] - [[ picking.partner_id and display_address(picking.partner_id) ]] - [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]] - - - Contact Address : - [[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]] - [[ picking.partner_id and display_address(picking.partner_id) ]] - [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]] - - - @@ -227,7 +212,7 @@ - + Description @@ -244,12 +229,15 @@ Quantity + + 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) ]] @@ -268,6 +256,9 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] + + [[ move_lines.product_id.ean13 ]] +
@@ -276,7 +267,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) ]] @@ -295,6 +286,9 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] + + [[ move_lines.product_id.ean13 ]] +