From 4a549808f6c1e09f4992cdec6a9d310f116d5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 13 Jun 2013 17:41:18 +0200 Subject: [PATCH] display the resource (translated) title along with the variations titles --- .../portal_skins/erp5_base/Delivery_getODTDataDict.xml | 6 ++++-- bt5/erp5_base/bt/revision | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 53ff38770a..3069c03395 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 2d677318be..487d273dda 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 -- 2.30.9