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 53ff38770a0ac3de3aef5ca9ddb64a58016ac1d5..3069c03395e02de20482913b7ae0f2d24acbf356 100755 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml @@ -163,7 +163,8 @@ def unicodeDict(d):\n \n for line in getSubLineList(context):\n prod_desc = line.getResource() is not None and \\\n - line.getResourceValue().getDescription() or line.getResourceTitle()\n + line.getResourceValue().getDescription() or (\n + request.get(\'international_form\') and line.getResourceTitle() or line.getResourceTranslatedTitle() )\n if use_line_title:\n desc = (line.getTitle(), )\n else:\n @@ -194,7 +195,8 @@ for line in getSubLineList(context):\n display_id = \'translated_title\'\n if request.get(\'international_form\'):\n display_id = \'title\'\n - desc = (\', \'.join([x[0] for x in line.getVariationCategoryItemList(display_id=display_id)]),)\n + variation_description = \', \'.join([x[0] for x in line.getVariationCategoryItemList(display_id=display_id)])\n + desc = (\'%s %s\' % (desc[0], variation_description), )\n is_tax=0\n portal_preferences = context.getPortalObject().portal_preferences\n if portal_preferences.getPreferredTaxUseList()==[] :\n diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 2d677318be9a7f186911d1213fec0ee5c2361989..487d273ddaf2d90947797f377d091c4b08061a64 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -1039 \ No newline at end of file +1040 \ No newline at end of file