From fc56151daa5c46f9ca32b9d301658a7cc3ee643d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 14 Aug 2008 08:58:51 +0000
Subject: [PATCH] - 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)
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22991 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../CounterModule_getVaultTransactionList.xml | 16 ++++++++++++----
.../accounting_date_workflow/states/draft.xml | 7 +++++++
bt5/erp5_banking_core/bt/revision | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
index 2451a12eb8..11092a8d3f 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
@@ -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 @@ return repr([x for x in total_inventory_list])\n
</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 @@ return repr([x for x in total_inventory_list])\n
<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 @@ return repr([x for x in total_inventory_list])\n
<string>excluded_variation_list</string>
<string>all_state</string>
<string>only_last_date</string>
+ <string>dictionaries</string>
<string>kw</string>
- <string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
+ <string>Products.ERP5Type.Document</string>
<string>DateTime</string>
<string>begin</string>
<string>None</string>
@@ -528,6 +535,7 @@ return repr([x for x in total_inventory_list])\n
<none/>
<int>0</int>
<int>0</int>
+ <int>0</int>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml
index f1b21bf782..3826c53d9b 100644
--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/draft.xml
@@ -37,11 +37,18 @@
<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>
</pickle>
</record>
diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision
index 3b7560b755..95bae2dc25 100644
--- a/bt5/erp5_banking_core/bt/revision
+++ b/bt5/erp5_banking_core/bt/revision
@@ -1 +1 @@
-445
\ No newline at end of file
+446
\ No newline at end of file
--
2.30.9