diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml index 74f742776d2f2273999b6a3dfad41b065fdb2661..c373ecdbcf6f34ccea253bfb6ee8b3e22504825a 100755 --- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml +++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml @@ -79,21 +79,33 @@ <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n <tr>\n <td tal:attributes="colwidth python: \'5cm\'" >\n - <para style="TableHeader" tal:content="python: here.Localizer.erp5_ui.gettext(field.get_value(\'title\')).encode(\'utf-8\')"/>\n + <para style="TableHeader" tal:content="python: here.translation_service.translate(\'ui\', field.get_value(\'title\')).encode(\'utf-8\')"/>\n </td>\n - <td tal:attributes="colwidth python: None" tal:define="value python: field.get_value(\'default\')">\n - <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n - <tal:block tal:repeat="item value">\n - <para style="TableStandard" tal:content="python: str(item)" />\n + <tal:block tal:define="item_list python:field.has_value(\'items\') and field.get_value(\'items\') or None">\n + <td tal:attributes="colwidth python: None" tal:define="value python: field.get_value(\'default\')">\n + <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n + <tal:block tal:repeat="item value">\n + <para style="TableStandard"\n + tal:content="python: str(item)"\n + tal:condition="not:item_list"/>\n + <para style="TableStandard"\n + tal:content="python: [i[0] for i in item_list if i[1] == item][0]"\n + tal:condition="item_list" />\n + </tal:block>\n </tal:block>\n - </tal:block>\n - <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n - <para style="TableStandard" tal:content="python: \'%s \' % value" />\n - </tal:block>\n - <tal:block tal:condition="python: value == None">\n - <para style="TableStandard" tal:content="python: \' \'" />\n - </tal:block>\n - </td>\n + <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n + <para style="TableStandard"\n + tal:content="python: str(value)"\n + tal:condition="not:item_list" />\n + <para style="TableStandard"\n + tal:content="python: [i[0] for i in item_list if i[1] == value][0]"\n + tal:condition="item_list" />\n + </tal:block>\n + <tal:block tal:condition="python: value == None">\n + <para style="TableStandard" tal:content="python: \' \'" />\n + </tal:block>\n + </td>\n + </tal:block>\n </tr>\n </tal:block>\n </tal:block>\n @@ -137,7 +149,10 @@ \n </tal:block>\n </content>\n -</document> +</document>\n +\n +\n + ]]></string> </value> </item> diff --git a/bt5/erp5_pdf_style/bt/change_log b/bt5/erp5_pdf_style/bt/change_log index c10b0a9f263c56630e887c35006d0d4b826f6571..a57133c0a88f00c8586ede424d5965543af80166 100755 --- a/bt5/erp5_pdf_style/bt/change_log +++ b/bt5/erp5_pdf_style/bt/change_log @@ -1,2 +1,5 @@ +2006-03-08 jerome +* Display the listfields value from items (only in form_view, still TODO in listbox_macro) + 2006-02-24 Seb * Created this business template in order to split erp5_core \ No newline at end of file diff --git a/bt5/erp5_pdf_style/bt/copyright_list b/bt5/erp5_pdf_style/bt/copyright_list index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e8d752e9776b23585d513bc13f26b8e937c4ecc2 100755 --- a/bt5/erp5_pdf_style/bt/copyright_list +++ b/bt5/erp5_pdf_style/bt/copyright_list @@ -0,0 +1 @@ +Copyright (c) 2005-2006 Nexedi SARL \ No newline at end of file diff --git a/bt5/erp5_pdf_style/bt/license b/bt5/erp5_pdf_style/bt/license index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a3e12bcad97e4b3bdd6a8bb499fd23a4bcb0819 100755 --- a/bt5/erp5_pdf_style/bt/license +++ b/bt5/erp5_pdf_style/bt/license @@ -0,0 +1 @@ +GPL \ No newline at end of file