diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml index cb6b9f7a2e309693c690f5e034d150e4efb68343..ae9b98c8e79967e1e481c0443fbba2ff68ed563e 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml @@ -242,12 +242,22 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> <table:table-cell table:style-name=\'field-table.A1\' office:value-type=\'string\'>\n <text:p text:style-name=\'field-label\' tal:content="python: here.Localizer.erp5_ui.gettext(field.get_value(\'title\')).encode(\'utf-8\')" />\n </table:table-cell>\n - <table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\' tal:define="value python: field.get_value(\'default\')">\n + <table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\'\n + tal:define="value python: field.get_value(\'default\')">\n <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n - <!-- XXX render_odf for list fields ? using TAL structure ? -->\n - <tal:block tal:repeat="item value">\n - <text:p text:style-name=\'field-content\' tal:content="item" />\n - </tal:block>\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 + <text:p text:style-name=\'field-content\'\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 + <!-- XXX render_odf for list fields ? using TAL structure ? -->\n + <tal:block tal:repeat="item value">\n + <text:p text:style-name=\'field-content\' tal:content="item" />\n + </tal:block>\n + </tal:block>\n </tal:block>\n <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()))">\n <text:p text:style-name=\'field-content\' tal:content="python: field.render_pdf(value)" />\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index ca7bf83ac53a27a2a914bed25e1a07478dd8ef47..da2d3988d7d1a255376770b1e87394ebb42febb3 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -13 \ No newline at end of file +14 \ No newline at end of file