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

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

diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 2956c5954eb..71a45b06a35 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,11 +29,13 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_productdesc':self.get_productdesc
+            'get_product_desc':self.get_product_desc
         })
-    def get_productdesc(self,code):
-        code = '[' + code.product_id.default_code + ']'
-        return [code]
+    def get_product_desc(self,move_line):
+        desc = move_line.product_id.name
+        if move_line.product_id.default_code:
+            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)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 688f879f14e..dfb202b75ff 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -251,8 +251,8 @@
       <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_productdesc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font><font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
+            <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>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -277,7 +277,8 @@
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
+           <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>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>