Commit 590a41e9 authored by Jérome Perrin's avatar Jérome Perrin

Don't display form_list headers

table:columns can only appear before table:row, so the previous change of displaying report title showed that we generated invalid odf when displaying something before a report section using form_list. "something" is also fields from the report form itself, so before that change, we were generating invaliding odf sometimes (this case is not tested at the time beeing). This change simply don't display form_list headers, and we have more similar rendering if report section uses form_list of form_view.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41067 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 11165be7
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
<table:table-column\n <table:table-column\n
table:style-name=\'co2\'\n table:style-name=\'co2\'\n
table:default-cell-style-name=\'report-column-title\'/>\n table:default-cell-style-name=\'report-column-title\'/>\n
\n
<table:table-row table:style-name=\'ro2\'>\n <table:table-row table:style-name=\'ro2\'>\n
<table:table-cell table:style-name="report-title"\n <table:table-cell table:style-name="report-title"\n
office:value-type=\'string\'\n office:value-type=\'string\'\n
...@@ -79,6 +78,8 @@ ...@@ -79,6 +78,8 @@
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
\n \n
\n
<!-- fields from the report form itself -->\n
<tal:block metal:use-macro="here/form_view/macros/form_layout"/>\n <tal:block metal:use-macro="here/form_view/macros/form_layout"/>\n
\n \n
<!-- if we are called with a rendered_report_item_list, just insert the rendered text here. -->\n <!-- if we are called with a rendered_report_item_list, just insert the rendered text here. -->\n
...@@ -88,7 +89,8 @@ ...@@ -88,7 +89,8 @@
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
\n \n
<tal:block tal:condition="not: rendered_report_item_list">\n <tal:block tal:condition="not: rendered_report_item_list"\n
tal:define="global display_header python:False">\n
\n \n
<tal:block tal:repeat="report_item report_item_list">\n <tal:block tal:repeat="report_item report_item_list">\n
<tal:block metal:define-macro="make_report_item_table"\n <tal:block metal:define-macro="make_report_item_table"\n
......
241 246
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment