[Erp5-report] r22066 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun 30 11:03:12 2008
New Revision: 22066

URL: http://svn.erp5.org?rev=22066&view=rev
Log:
When office:value-type is set to float, office:value must be defined, otherwise odf is invalid with this cryptic message: Element text has extra content: sequence-decls 

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml?rev=22066&r1=22065&r2=22066&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml Mon Jun 30 11:03:12 2008
@@ -494,9 +494,11 @@
                       tal:content=\'python:line_dict["description"]\'\n
                       tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\n
             </table:table-cell>\n
-            <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+            <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              office:value-type=\'float\'\n
+                              tal:attributes=\'office:value line_dict/total_quantity\'> \n
               <text:p text:style-name=\'Table_20_Contents\'\n
-                      tal:content=\'python:line_dict["total_quantity"]\'\n
+                      tal:content=\'line_dict/total_quantity\'\n
                       tal:attributes=\'text:style-name right_style_name\'>qty</text:p>\n
             </table:table-cell>\n
             <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
@@ -509,12 +511,16 @@
                       tal:content=\'python:line_dict["stop_date"]\'\n
                       tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
             </table:table-cell>\n
-            <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+            <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              office:value-type=\'float\'\n
+                              tal:attributes="office:value line_dict/base_price">\n
               <text:p text:style-name=\'Table_20_Contents\'\n
                       tal:content=\'python:line_dict["base_price"]\'\n
                       tal:attributes=\'text:style-name right_style_name\'>base_price</text:p>\n
             </table:table-cell>\n
-            <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+            <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              office:value-type=\'float\'\n
+                              tal:attributes=\'office:value line_dict/total_price\'>\n
               <text:p text:style-name=\'Table_20_Contents\'\n
                       tal:content=\'python:line_dict["total_price"]\'\n
                       tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n
@@ -561,7 +567,9 @@
                   <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
                   <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
                 </table:table-cell>\n
-                <table:table-cell table:style-name=\'Tableau3.E2\' office:value-type=\'float\'>\n
+                <table:table-cell table:style-name=\'Tableau3.E2\'\n
+                                  office:value-type=\'float\'\n
+                                  tal:attributes=\'office:value data_dict/total_price_novat\'>\n
                   <text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:data_dict["total_price_novat"]\'>800.000,00</text:p>\n
                 </table:table-cell>\n
               </table:table-row>\n
@@ -679,7 +687,8 @@
       <text:p text:style-name=\'P4\'/>\n
     </office:text>\n
   </office:body>\n
-</office:document-content>
+</office:document-content>\n
+
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22066&r1=22065&r2=22066&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Mon Jun 30 11:03:12 2008
@@ -1,1 +1,1 @@
-396
+397