[Erp5-report] r22991 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: aurel
Date: Thu Aug 14 10:58:51 2008
New Revision: 22991

URL: http://svn.erp5.org?rev=22991&view=rev
Log:
- allow cancel from draft state on accounting date
- make it possible to use dictionnaries instead of temp object in report in order to use less memory (from vincent)

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
    erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml?rev=22991&r1=22990&r2=22991&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml Thu Aug 14 10:58:51 2008
@@ -76,7 +76,13 @@
 #                             [\'cash_status/valid\', \'cash_status/new_not_emitted\']\n
 #\n
 \n
-from Products.ERP5Type.Document import newTempBase\n
+if dictionaries:\n
+  def newTempBase(ignored, object_id, **kw):\n
+    kw[\'id\'] = object_id\n
+    return kw\n
+else:\n
+  from Products.ERP5Type.Document import newTempBase\n
+\n
 from DateTime import DateTime\n
 begin = DateTime()\n
 \n
@@ -383,7 +389,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>vault=None,at_date=None,from_date=None,vault_report_type=None,column_names=0,resource_portal_type=(\'Banknote\',\'Coin\'), only_positive=0, banknote_quantity_divisor=None, summarise=False, excluded_variation_list=None, all_state=0, only_last_date=0, **kw</string> </value>
+            <value> <string>vault=None,at_date=None,from_date=None,vault_report_type=None,column_names=0,resource_portal_type=(\'Banknote\',\'Coin\'), only_positive=0, banknote_quantity_divisor=None, summarise=False, excluded_variation_list=None, all_state=0, only_last_date=0, dictionaries=False, **kw</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
@@ -411,7 +417,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>12</int> </value>
+                        <value> <int>13</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -429,9 +435,10 @@
                             <string>excluded_variation_list</string>
                             <string>all_state</string>
                             <string>only_last_date</string>
+                            <string>dictionaries</string>
                             <string>kw</string>
+                            <string>newTempBase</string>
                             <string>Products.ERP5Type.Document</string>
-                            <string>newTempBase</string>
                             <string>DateTime</string>
                             <string>begin</string>
                             <string>None</string>
@@ -528,6 +535,7 @@
                 <none/>
                 <int>0</int>
                 <int>0</int>
+                <int>0</int>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml?rev=22991&r1=22990&r2=22991&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml Thu Aug 14 10:58:51 2008
@@ -37,9 +37,16 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
+                <string>cancel</string>
                 <string>open</string>
                 <string>open_action</string>
               </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
       </dictionary>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=22991&r1=22990&r2=22991&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Thu Aug 14 10:58:51 2008
@@ -1,1 +1,1 @@
-445
+446