diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 3dec126ddda..f27d95b44e0 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -213,7 +213,7 @@ - + Description @@ -222,20 +222,25 @@ Lot - State + State - Qty + Quantity - Location + Location - + + + + + +
[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]] - + [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] @@ -244,7 +249,7 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state ]] + [[ move_lines.state ]] [[ move_lines.product_qty ]] @@ -253,7 +258,7 @@ [[ move_lines.product_uom.name ]] - [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] @@ -261,16 +266,12 @@
- - - - Non Assigned Products: [[ (line.state == 'assigned') and removeParentNode('para') ]] - - - + [[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]] + Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]] + [[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]] - + [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] @@ -279,7 +280,7 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state ]] + [[ move_lines.state ]] [[ move_lines.product_qty ]] @@ -288,7 +289,7 @@ [[ move_lines.product_uom.name ]] - [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]