diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml index 958cc15bd6ba653679d8f54e30a2228a38aeba88..83876a996ecc6eb90470e43c0128d0c8abf64870 100644 --- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml +++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5Form.PDFTemplate</string> - <string>PDFTemplate</string> - </tuple> - <none/> + <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -88,8 +85,17 @@ </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:condition="python: field.has_value(\'items\')"\n + tal:define="field_item_dict python:dict([(x[1], x[0]) for x in field.get_value(\'items\')]);">\n + <tal:block tal:repeat="item value">\n + <para style="TableStandard"\n + tal:content="python: field_item_dict.get(item, \'??? (%s)\' % item)"/>\n + </tal:block>\n + </tal:block>\n + <tal:block tal:condition="python: not field.has_value(\'items\')">\n + <tal:block tal:repeat="item value">\n + <para style="TableStandard" tal:content="python: str(item)" />\n + </tal:block>\n </tal:block>\n </tal:block>\n <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()) or same_type(value, None))">\n diff --git a/bt5/erp5_pdf_style/bt/revision b/bt5/erp5_pdf_style/bt/revision index 2e66562e2705f8e5c5ddccceeecaab861194f30a..c5b431b6cba29540b4b284840ff229bce0460886 100644 --- a/bt5/erp5_pdf_style/bt/revision +++ b/bt5/erp5_pdf_style/bt/revision @@ -1 +1 @@ -49 \ No newline at end of file +50 \ No newline at end of file diff --git a/bt5/erp5_pdf_style/bt/template_tool_id_list b/bt5/erp5_pdf_style/bt/template_tool_id_list new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391