If the line has a description, don't show product description

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22713 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml

@@ -79,14 +79,11 @@ def getFieldAsLineList(field):\n
   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

bt5/erp5_base/bt/revision

-382
\ No newline at end of file
+383
\ No newline at end of file