diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml index 56200e14d9282df10ff534b0ff0d8b159b8229d9..182706bb992d20c08964e7c7c4b9e50416d21965 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml +++ b/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 diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 6d540e9f236101856eb2bf19a40e20084d6afd26..be6c136492c29e96d1d42c240ce1fe2d5f9d302c 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -382 \ No newline at end of file +383 \ No newline at end of file