generate valid ODF for hierarchical orders

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22727 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml

@@ -510,11 +510,17 @@ AAA=</string> </value>
             </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 @@ AAA=</string> </value>
                       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,12 +540,23 @@ AAA=</string> </value>
                       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
         <table:table-row table:style-name=\'Tableau1.5\'>\n

bt5/erp5_trade/bt/revision

-445
+447
\ No newline at end of file