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

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Nov 29 13:40:39 CET 2010


Author: jerome
Date: Mon Nov 29 13:40:39 2010
New Revision: 40873

URL: http://svn.erp5.org?rev=40873&view=rev
Log:
display report tite in report view, and use report title as sheet name

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=40873&r1=40872&r2=40873&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] Mon Nov 29 13:40:39 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -67,11 +64,20 @@
         </tal:block>\n
         <tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
           <tal:block tal:condition="not: sheet_per_reportsection">\n
-            <table:table tal:attributes="table:name python:unicode(here.getProperty(\'title\'), \'utf8\')" i18n:attributes="table:name">\n
+            <table:table tal:attributes="table:name python:unicode(form.getProperty(\'title\'), \'utf8\')" i18n:attributes="table:name">\n
               <!-- at least one table-column element is required for ODF to validate -->\n
               <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
+                                  table:number-columns-spanned=\'5\'\n
+                                  table:number-rows-spanned=\'1\'>\n
+                  <text:p i18n:translate="" tal:content="python: unicode(form.getProperty(\'title\'), \'utf8\')" ></text:p>\n
+                </table:table-cell>\n
+              </table:table-row>\n
 \n
               <tal:block metal:use-macro="here/form_view/macros/form_layout"/>\n
 \n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=40873&r1=40872&r2=40873&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Mon Nov 29 13:40:39 2010
@@ -1 +1 @@
-243
\ No newline at end of file
+241
\ No newline at end of file




More information about the Erp5-report mailing list