[Erp5-report] r22713 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jul 29 11:27:04 2008
New Revision: 22713

URL: http://svn.erp5.org?rev=22713&view=rev
Log:
If the line has a description, don't show product description

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml?rev=22713&r1=22712&r2=22713&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml Tue Jul 29 11:27:04 2008
@@ -79,14 +79,11 @@
   return [x for x in text_list if x]\n
 \n
 def getProductAndLineDesc(prod_desc, line_desc):\n
-  if prod_desc and line_desc and \'\\n\' not in prod_desc and \'\\n\' not in line_desc:\n
-    return (\' - \'.join([getFieldAsString(prod_desc),\n
-            getFieldAsString(line_desc)]),)\n
   line_list = []\n
-  if prod_desc:\n
-    line_list.extend(getFieldAsLineList(prod_desc))\n
   if line_desc:\n
     line_list.extend(getFieldAsLineList(line_desc))\n
+  elif prod_desc:\n
+    line_list.extend(getFieldAsLineList(prod_desc))\n
   return line_list\n
 \n
 def getOneLineAddress(text, region):\n

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=22713&r1=22712&r2=22713&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Tue Jul 29 11:27:04 2008
@@ -1,1 +1,1 @@
-382
+383