From b18a7259b97f0172b4d7233d5549f0b857826291 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 7 Nov 2012 18:07:44 +0530
Subject: [PATCH] [IMP]: Improve code in delivery slip report

bzr revid: aja@tinyerp.com-20121107123744-yejs40zxjp1do1o3
---
 addons/stock/report/picking.py  |  2 +-
 addons/stock/report/picking.rml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

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 dfb202b75ff..f522f2b5f56 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -163,13 +163,13 @@
           <para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_9">[[ (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 ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or or removeParentNode('para')]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
-          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
         </td>
       </tr>
     </blockTable>
@@ -251,8 +251,7 @@
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -277,8 +276,7 @@
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
-           <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>