diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 71a45b06a35..711abbf6259 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -35,7 +35,7 @@ class picking(report_sxw.rml_parse):
desc = move_line.product_id.name
if move_line.product_id.default_code:
desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
- return [desc]
+ return desc
report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 4bbb6fecead..ecc682dceda 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -163,13 +163,13 @@
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]]
+ [[ 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]]
+ [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]
|
@@ -251,8 +251,7 @@
|
- [[ repeatIn(get_product_desc(move_lines),'desc') ]]
- [[ desc ]]
+ [[ get_product_desc(move_lines) ]]
|
[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]
@@ -277,8 +276,7 @@
|
- [[ repeatIn(get_product_desc(move_lines),'desc') ]]
- [[ desc ]]
+ [[ get_product_desc(move_lines) ]]
|
[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]
| |