[Erp5-report] r19096 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: yusei
Date: Wed Feb  6 11:45:24 2008
New Revision: 19096

URL: http://svn.erp5.org?rev=19096&view=rev
Log:
Fixed a bug which occurs when section category is not defined.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=19096&r1=19095&r2=19096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Wed Feb  6 11:45:24 2008
@@ -444,6 +444,8 @@
           <dtml-unless sequence-start>,</dtml-unless>\n
           <dtml-var sequence-item>\n
         </dtml-in>\n
+        , delivery.start_date as operation_date\n
+        , \'source\' as section_mark\n
         <dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
       </dtml-if>\n
     \n
@@ -461,7 +463,9 @@
       </dtml-if>\n
       <dtml-if use_movement_table> movement,  </dtml-if>\n
       <dtml-if "stat or omit_input or omit_output or node">\n
-          stock, catalog as child, </dtml-if>\n
+          stock, catalog as child,\n
+        <dtml-unless section_category>category,</dtml-unless>\n
+      </dtml-if>\n
       <dtml-if "section_category">category, catalog as section, </dtml-if>\n
       catalog,\n
       delivery\n
@@ -1072,6 +1076,8 @@
           <dtml-unless sequence-start>,</dtml-unless>\n
           <dtml-var sequence-item>\n
         </dtml-in>\n
+        , delivery.start_date as operation_date\n
+        , \'source\' as section_mark\n
         <dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
       </dtml-if>\n
     \n
@@ -1089,7 +1095,9 @@
       </dtml-if>\n
       <dtml-if use_movement_table> movement,  </dtml-if>\n
       <dtml-if "stat or omit_input or omit_output or node">\n
-          stock, catalog as child, </dtml-if>\n
+          stock, catalog as child,\n
+        <dtml-unless section_category>category,</dtml-unless>\n
+      </dtml-if>\n
       <dtml-if "section_category">category, catalog as section, </dtml-if>\n
       catalog,\n
       delivery\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19096&r1=19095&r2=19096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Feb  6 11:45:24 2008
@@ -1,1 +1,1 @@
-579
+583