[Erp5-report] r40373 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Nov 18 15:12:40 2010
New Revision: 40373

URL: http://svn.erp5.org?rev=40373&view=rev
Log:
restore the ability to use a from date in preference from Transaction tab

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml?rev=40373&r1=40372&r2=40373&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml [utf8] Thu Nov 18 15:12:40 2010
@@ -63,6 +63,12 @@ if params.get(\'precision\', None) is no
   # listbox editable float fields uses request/precision to format the value.\n
   request.set(\'precision\', params[\'precision\'])\n
 \n
+if not request.get(\'is_accounting_report\'):\n
+  # if we are in the UI, we use from date from preferences, but in a report we\n
+  # don\'t use any information from preferences, as they are passed by the\n
+  # report dialog\n
+  from_date = portal.portal_preferences.getPreferredAccountingTransactionFromDate()\n
+\n
 # this script can be used for Node, Section or Payment\n
 if kw.get(\'node_uid\'):\n
   params[\'node_uid\'] = kw[\'node_uid\']\n
@@ -130,6 +136,7 @@ if params.get(\'node_uid\'):\n
     is_pl_account = node.isMemberOf(\'account_type/expense\')\\\n
                  or node.isMemberOf(\'account_type/income\')\n
 \n
+\n
 if is_pl_account and not from_date:\n
   from_date = params.get(\'period_start_date\')\n
 \n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=40373&r1=40372&r2=40373&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Nov 18 15:12:40 2010
@@ -1 +1 @@
-1404
\ No newline at end of file
+1405
\ No newline at end of file