[Erp5-report] r7071 - /erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_ac...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed May  3 20:54:29 2006
New Revision: 7071

URL: http://svn.erp5.org?rev=7071&view=rev
Log:
don't substract 1 to from_date, because it might be None in case it's not set in preferences

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml?rev=7071&r1=7070&r2=7071&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml Wed May  3 20:54:29 2006
@@ -66,8 +66,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>src__ = False\n
-if kw.has_key(\'src__\'): src__ = kw[\'src__\']\n
+            <value> <string>src__ = kw.get(\'src__\', False)\n
 precision = context.Base_getPreferredPrecision()\n
 r_ = lambda x: context.Base_getRoundValue(x, precision)\n
 \n
@@ -92,10 +91,13 @@
 # Build the common inventory dict\n
 params = {}\n
 \n
-if kw.get(\'no_from_date\', False): from_date = None\n
-\n
-if simulation_state: params[\'simulation_state\'] = simulation_state\n
-if section_category: params[\'section_category\'] = section_category\n
+if kw.get(\'no_from_date\', False):\n
+  from_date = None\n
+\n
+if simulation_state:\n
+  params[\'simulation_state\'] = simulation_state\n
+if section_category:\n
+  params[\'section_category\'] = section_category\n
 \n
 # Get payment and mirror related parameters\n
 MARKER = []\n
@@ -121,10 +123,8 @@
 \n
 # Create a new parameter list to get the previous balance\n
 get_inventory_kw = params.copy()\n
-get_inventory_kw.update({ \'omit_simulation\' : True\n
-                        , \'to_date\'         : from_date\n
-                        , \'where_expression\': " section.portal_type = \'Organisation\' "\n
-                        , \'stat\'            : True\n
+get_inventory_kw.update({ \'to_date\'         : from_date,\n
+                          \'where_expression\': " section.portal_type = \'Organisation\' "\n
                         })\n
 \n
 # Get previous debit and credit\n
@@ -147,7 +147,7 @@
 \n
   previous_balance.edit( \\\n
       title                  = context.Base_translateString("Previous Balance")\n
-    , date                   = from_date - 1\n
+    , date                   = from_date\n
     , portal_type            = ""\n
     , simulation_state_title = ""\n
     , debit                  = previous_total_debit\n
@@ -240,10 +240,9 @@
                           <tuple>
                             <string>selection</string>
                             <string>kw</string>
+                            <string>_getattr_</string>
                             <string>False</string>
                             <string>src__</string>
-                            <string>_getattr_</string>
-                            <string>_getitem_</string>
                             <string>context</string>
                             <string>precision</string>
                             <string>r_</string>