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

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Feb 5 16:42:25 CET 2008


Author: yusei
Date: Tue Feb  5 16:42:25 2008
New Revision: 19065

URL: http://svn.erp5.org?rev=19065&view=rev
Log:
Calculating correct timezone is difficult. So, get datetime value from document accessor.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml
    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_viewAccountingTransactionList/listbox_operation_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml?rev=19065&r1=19064&r2=19065&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml Tue Feb  5 16:42:25 2008
@@ -498,7 +498,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:cell.operation_date.toZone(cell.operation_date.localZone())</string> </value>
+            <value> <string>python:(cell.section_mark==\'source\' and cell.getStartDate()) or cell.getStopDate()</string> </value>
         </item>
       </dictionary>
     </pickle>

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=19065&r1=19064&r2=19065&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 Tue Feb  5 16:42:25 2008
@@ -639,6 +639,7 @@
               <dtml-var sequence-item>\n
             </dtml-in>\n
             , delivery.start_date as operation_date\n
+            , \'source\' as section_mark\n
             , catalog.source_reference as specific_reference\n
             <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
               <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
@@ -817,6 +818,7 @@
               <dtml-var sequence-item>\n
             </dtml-in>\n
             , delivery.stop_date as operation_date\n
+            , \'destination\' as section_mark\n
             , catalog.destination_reference as specific_reference\n
             <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
               <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
@@ -1265,6 +1267,7 @@
               <dtml-var sequence-item>\n
             </dtml-in>\n
             , delivery.start_date as operation_date\n
+            , \'source\' as section_mark\n
             , catalog.source_reference as specific_reference\n
             <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
               <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
@@ -1443,6 +1446,7 @@
               <dtml-var sequence-item>\n
             </dtml-in>\n
             , delivery.stop_date as operation_date\n
+            , \'destination\' as section_mark\n
             , catalog.destination_reference as specific_reference\n
             <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
               <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19065&r1=19064&r2=19065&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Feb  5 16:42:25 2008
@@ -1,1 +1,1 @@
-573
+575




More information about the Erp5-report mailing list