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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jul 29 16:54:01 2008
New Revision: 22727

URL: http://svn.erp5.org?rev=22727&view=rev
Log:
generate valid ODF for hierarchical orders

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=22727&r1=22726&r2=22727&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 Tue Jul 29 16:54:01 2008
@@ -510,11 +510,17 @@
             </table:table-cell>\n
             <table:table-cell table:style-name=\'Tableau1.A3\'\n
                               office:value-type=\'float\'\n
+                              tal:condition="python: line_dict[\'total_quantity\'] != \'\'"\n
                               tal:attributes=\'office:value line_dict/total_quantity\'> \n
               <text:p text:style-name=\'Table_20_Contents\'\n
                       tal:content="python: quantity_renderer(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\'\n
+                              office:value-type=\'string\'\n
+                              tal:condition="python: line_dict[\'total_quantity\'] == \'\'"> \n
+              <text:p text:style-name=\'Table_20_Contents\'/>\n
+            </table:table-cell>\n
             <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
               <text:p text:style-name=\'Table_20_Contents\'\n
                       tal:content=\'python:line_dict["quantity_unit"]\'\n
@@ -526,6 +532,7 @@
                       tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
             </table:table-cell>\n
             <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              tal:condition="python: line_dict[\'base_price\'] != \'\'"\n
                               office:value-type=\'float\'\n
                               tal:attributes="office:value line_dict/base_price">\n
               <text:p text:style-name=\'Table_20_Contents\'\n
@@ -533,11 +540,22 @@
                       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\'\n
+                              office:value-type=\'string\'\n
+                              tal:condition="python: line_dict[\'base_price\'] == \'\'"> \n
+              <text:p text:style-name=\'Table_20_Contents\'/>\n
+            </table:table-cell>\n
+            <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              tal:condition="python: line_dict[\'total_price\'] != \'\'"\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: price_renderer(line_dict[\'total_price\'])"\n
                       tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n
+            </table:table-cell>\n
+            <table:table-cell table:style-name=\'Tableau1.A3\'\n
+                              office:value-type=\'string\'\n
+                              tal:condition="python: line_dict[\'total_price\'] == \'\'"> \n
+              <text:p text:style-name=\'Table_20_Contents\'/>\n
             </table:table-cell>\n
           </div>\n
         </table:table-row>\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22727&r1=22726&r2=22727&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Jul 29 16:54:01 2008
@@ -1,1 +1,1 @@
-445
+447