diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml index c95b470868364f4146b875e765cae1617ae9f84e..ef7e618191ca73c3057d1863986f0ea600d2066a 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml @@ -282,7 +282,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> text:anchor-type="paragraph"\n tal:attributes="svg:height python:str(height_graph)+\'cm\';\n svg:width python:str(width_graph)+\'cm\'"\n - tal:content="structure python: field.render_odf()">\n + tal:content="structure python: field.render_odf(render_prefix=render_prefix)">\n </draw:frame>\n </text:p>\n </tal:block>\n @@ -343,7 +343,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> text:anchor-type="paragraph"\n tal:attributes="svg:height python:height;\n svg:width python:width">\n - <tal:block tal:replace="structure python: field.render_odf()"/>\n + <tal:block tal:replace="structure python: field.render_odf(render_prefix=render_prefix)"/>\n </draw:frame>\n </text:p>\n \n @@ -422,7 +422,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> text:anchor-type="paragraph"\n tal:attributes="svg:height python:height;\n svg:width python:width">\n - <tal:block tal:replace="structure python: field.render_odf()"/>\n + <tal:block tal:replace="structure python: field.render_odf(render_prefix=render_prefix)"/>\n </draw:frame>\n </text:p>\n </tal:block>\n diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml index 3e3299169aab677b1fb69c3c27e0649f5f079345..1f550284ab3f39587548f96a260e802d0cc5094e 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml @@ -90,7 +90,7 @@ </text:sequence-decls>\n ***** ########### listbox: must define the field listbox before calling this macro ! ########### *****\n <tal:block metal:define-macro="listbox">\n - <tal:block tal:define="listboxline_list python:listbox.get_value(\'default\', render_format=\'list\', REQUEST=request);\n + <tal:block tal:define="listboxline_list python:listbox.get_value(\'default\', render_format=\'list\', REQUEST=request, render_prefix=render_prefix);\n selection_name python:listbox.get_value(\'selection_name\', REQUEST=request);\n editable_columns python:listbox.get_value(\'editable_columns\', REQUEST=request);\n untranslatable_columns_dict python:dict([(column[0],1) for column in listbox.get_value(\'untranslatable_columns\', REQUEST=request)]);\n 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 da136b738f849e190a83a3773a988952647c1e12..38e7587c6ff45b216e81ea5a2069a235426586fa 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 @@ -248,7 +248,9 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> <tal:block tal:define="portal_object here/portal_url/getPortalObject">\n <tal:block tal:repeat="report_item report_item_list">\n <tal:block tal:define="here python:report_item.getObject(portal_object);\n - dummy python:report_item.pushReport(portal_object)">\n + render_prefix python: \'x%s\' % (repeat[\'report_item\'].index, );\n + dummy python:report_item.pushReport(portal_object,\n + render_prefix=render_prefix)">\n <tal:block metal:define-macro="render_report_section">\n <tal:block tal:condition="report_item/getTitle">\n <text:p\n @@ -266,8 +268,9 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> <tal:block metal:use-macro="form/form_list/macros/form_layout"/>\n </tal:block></tal:block></tal:block>\n </tal:block>\n + <tal:block tal:define="dummy python:report_item.popReport(portal_object,\n + render_prefix=render_prefix)"/>\n </tal:block>\n - <tal:block tal:define="dummy python:report_item.popReport(portal_object)"/>\n </tal:block>\n </tal:block>\n </tal:block>\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index 4b6f9c39e5c757bf387d465c53026b336dd8b96c..b44fe09a7a833a4736542e3a089713d34eb4abaa 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -64 \ No newline at end of file +65 \ No newline at end of file