[Erp5-report] r41067 jerome - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Dec  2 18:12:52 2010
New Revision: 41067

URL: http://svn.erp5.org?rev=41067&view=rev
Log:
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.

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
    erp5/trunk/bt5/erp5_ods_style/bt/revision

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml?rev=41067&r1=41066&r2=41067&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] Thu Dec  2 18:12:52 2010
@@ -69,7 +69,6 @@
               <table:table-column\n
                     table:style-name=\'co2\'\n
                     table:default-cell-style-name=\'report-column-title\'/>\n
-              \n
               <table:table-row table:style-name=\'ro2\'>\n
                 <table:table-cell table:style-name="report-title"\n
                                   office:value-type=\'string\'\n
@@ -79,6 +78,8 @@
                 </table:table-cell>\n
               </table:table-row>\n
 \n
+\n
+              <!-- fields from the report form itself -->\n
               <tal:block metal:use-macro="here/form_view/macros/form_layout"/>\n
 \n
               <!-- if we are called with a rendered_report_item_list, just insert the rendered text here. -->\n
@@ -88,7 +89,8 @@
                 </tal:block>\n
               </tal:block>\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
                 <tal:block tal:repeat="report_item report_item_list">\n
                   <tal:block metal:define-macro="make_report_item_table"\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=41067&r1=41066&r2=41067&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Thu Dec  2 18:12:52 2010
@@ -1 +1 @@
-241
\ No newline at end of file
+246
\ No newline at end of file