[Erp5-report] r15261 - in /erp5/trunk/bt5/erp5_banking_core: ActionTemplateItem/portal_type...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 20 12:44:05 CEST 2007
Author: seb
Date: Fri Jul 20 12:44:05 2007
New Revision: 15261
URL: http://svn.erp5.org?rev=15261&view=rev
Log:
- accounting date improvement made by Vincent
- improved script that checks all open counters
Added:
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCounterDate.xml
Modified:
erp5/trunk/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/print_pdf.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/scripts/checkOpenPossible.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/transitions/close_action.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/print_pdf.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%2520Module/print_pdf.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/print_pdf.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/print_pdf.xml Fri Jul 20 12:44:05 2007
@@ -51,7 +51,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>4.0</float> </value>
+ <value> <float>60.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.xml Fri Jul 20 12:44:05 2007
@@ -71,14 +71,18 @@
\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import Message\n
+from DateTime import DateTime\n
\n
if date is None:\n
# get current date\n
- from DateTime import DateTime\n
date = DateTime()\n
\n
# Make sure we have a date with no hours\n
-date = date.Date()\n
+try:\n
+ date = date.Date()\n
+except AttributeError:\n
+ # Assume that non-date parameter contains the bare date.\n
+ pass\n
\n
if site is None:\n
# get site from user assignment\n
@@ -92,11 +96,20 @@
# get only the office, not need of vault\n
#context.log(\'Baobab_checkAccountingDateOpen\', \'get site for vault %s\' %(site))\n
site = context.Baobab_getVaultSite(site)\n
-\n
-if context.portal_catalog.countResults(portal_type=\'Accounting Date\', start_date={\'query\':\'<=%s\' % (date, ), \'type\': \'date\', \'format\': \'%Y/%m/%d\'}, site_id=site.getId(), simulation_state="opened", limit=1)[0][0] == 0:\n
- raise Exception, context.portal_catalog.countResults(portal_type=\'Accounting Date\', start_date={\'query\':\'<=%s\' % (date, ), \'type\': \'date\', \'format\': \'%Y/%m/%d\'}, site_id=site.getId(), simulation_state="opened", limit=1, src__=1)\n
+error = False\n
+if context.portal_catalog.countResults(portal_type=\'Accounting Date\', site_id=site.getId(), simulation_state="opened", limit=1)[0][0] == 0:\n
+ # If there is no opened accounting date, consider today as an openned accounting day.\n
+ if DateTime(date) < DateTime(DateTime().Date()):\n
+ error = True\n
+elif context.portal_catalog.countResults(portal_type=\'Accounting Date\', start_date={\'query\':\'<=%s\' % (date, ), \'type\': \'date\', \'format\': \'%Y/%m/%d\'}, site_id=site.getId(), simulation_state="opened", limit=1)[0][0] == 0:\n
+ # If an accounting date is openned but posterior to checked date, verification fails.\n
+ error= True\n
+\n
+if error:\n
msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
raise ValidationFailed, (msg,)\n
+\n
+return "ok"\n
]]></string> </value>
@@ -161,14 +174,17 @@
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
+ <string>DateTime</string>
<string>None</string>
- <string>DateTime</string>
<string>_getattr_</string>
+ <string>AttributeError</string>
<string>context</string>
<string>site_list</string>
<string>len</string>
<string>_getitem_</string>
- <string>Exception</string>
+ <string>False</string>
+ <string>error</string>
+ <string>True</string>
<string>msg</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.xml Fri Jul 20 12:44:05 2007
@@ -65,14 +65,27 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>site = context.Baobab_getVaultSite(counter)\n
-counter_list = [x.getObject() for x in context.portal_catalog(portal_type="Counter", simulation_state = \'open\', site_uid = site.getUid())]\n
-for counter_ob in counter_list:\n
-# context.log(counter.getRelativeUrl(), counter_ob.getSite())\n
- if "site/%s" %counter_ob.getSite() in counter.getRelativeUrl() or counter.getRelativeUrl() in "site/%s" %counter_ob.getSite():\n
- return 1\n
+ <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+from Products.ERP5Type.Message import Message\n
+\n
+if simulation_state_list is None:\n
+ simulation_state_list = [\'open\']\n
+\n
+site = context.Baobab_getVaultSite(counter)\n
+counter_list = [x.getObject() for x in context.portal_catalog(portal_type="Counter", \n
+ simulation_state = simulation_state_list, site_uid = site.getUid())]\n
+if same_type(counter, \'a\'):\n
+ counter_relative_url = counter\n
else:\n
- return 0\n
+ counter_relative_url = counter.getRelativeUrl()\n
+found = 0\n
+if "guichet" in counter_relative_url:\n
+ for counter_ob in counter_list:\n
+ if "site/%s" %counter_ob.getSite() in counter_relative_url or counter_relative_url in "site/%s" %counter_ob.getSite():\n
+ found = 1\n
+if found == 0:\n
+ msg = Message(domain = "ui", message="Counter is not opened")\n
+ raise ValidationFailed, (msg,)\n
</string> </value>
</item>
<item>
@@ -95,7 +108,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>counter</string> </value>
+ <value> <string>counter, simulation_state_list=None</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -123,13 +136,19 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>counter</string>
+ <string>simulation_state_list</string>
+ <string>Products.DCWorkflow.DCWorkflow</string>
+ <string>ValidationFailed</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>None</string>
<string>_getattr_</string>
<string>context</string>
<string>site</string>
@@ -138,7 +157,11 @@
<string>_getiter_</string>
<string>x</string>
<string>counter_list</string>
+ <string>same_type</string>
+ <string>counter_relative_url</string>
+ <string>found</string>
<string>counter_ob</string>
+ <string>msg</string>
</tuple>
</value>
</item>
@@ -150,7 +173,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <none/>
+ </tuple>
</value>
</item>
<item>
Added: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCounterDate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCounterDate.xml?rev=15261&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCounterDate.xml (added)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCounterDate.xml Fri Jul 20 12:44:05 2007
@@ -1,0 +1,170 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string># Retrieve the last counter date for a given date\n
+\n
+from DateTime import DateTime\n
+if start_date is None:\n
+ start_date = DateTime()\n
+\n
+counter_date_list = context.portal_catalog(portal_type=\'Counter Date\', \n
+ site_uid=site_uid, \n
+ start_date={\'query\':start_date,\'range\':\'ngt\'},\n
+ sort_on=[(\'start_date\',\'descending\')], limit=1)\n
+counter_date = None\n
+if len(counter_date_list)==1:\n
+ counter_date = counter_date_list[0]\n
+return counter_date\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>site_uid=None, start_date=None</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>site_uid</string>
+ <string>start_date</string>
+ <string>DateTime</string>
+ <string>None</string>
+ <string>_getattr_</string>
+<string>context</string>
+ <string>counter_date_list</string>
+ <string>counter_date</string>
+ <string>len</string>
+ <string>_getitem_</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <none/>
+ <none/>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_getCounterDate</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml Fri Jul 20 12:44:05 2007
@@ -151,6 +151,7 @@
catalog_kw[\'vault_type_uid\']=vault_type_uid_list\n
site_member_list = context.portal_catalog(portal_type=\'Category\',\n
relative_url=\'%s%%\' % site_object.getRelativeUrl(),\n
+ limit=None,\n
**catalog_kw\n
)\n
for site_member in site_member_list:\n
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/scripts/checkOpenPossible.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/scripts/checkOpenPossible.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/scripts/checkOpenPossible.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/scripts/checkOpenPossible.xml Fri Jul 20 12:44:05 2007
@@ -79,19 +79,6 @@
if site_uid is None:\n
msg = Message(domain=\'ui\',message="Sorry, the site is not defined")\n
raise ValidationFailed (msg,)\n
-\n
-# Check if date defined on the accounting_date is the current date\n
-if now.Date() != accounting_date.getStartDate().Date():\n
- msg = Message(domain=\'ui\',message="Sorry, the date is not today")\n
- raise ValidationFailed (msg,)\n
-\n
-# Check for any other opened accounting date on the same site\n
-accounting_date_uid = accounting_date.getUid()\n
-opened_accounting_date_list = accounting_date.portal_catalog(portal_type=\'Accounting Date\', site_uid=site_uid, simulation_state=\'opened\')\n
-for opened_accounting_date in opened_accounting_date_list:\n
- if opened_accounting_date.getUid() != accounting_date_uid:\n
- msg = Message(domain=\'ui\',message="Sorry, there is already an opened accounting date")\n
- raise ValidationFailed (msg,)\n
</string> </value>
</item>
<item>
@@ -147,10 +134,6 @@
<string>site_uid</string>
<string>None</string>
<string>msg</string>
- <string>accounting_date_uid</string>
- <string>opened_accounting_date_list</string>
- <string>_getiter_</string>
- <string>opened_accounting_date</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/transitions/close_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/transitions/close_action.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/transitions/close_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/transitions/close_action.xml Fri Jul 20 12:44:05 2007
@@ -51,7 +51,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
- <value> <string>checkClosePossible</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml Fri Jul 20 12:44:05 2007
@@ -84,13 +84,14 @@
else:\n
current_date = date_list[0].getStartDate()\n
\n
-site_uid = transaction.getSiteUid()\n
+# We should not reject automatically\n
+# I (seb) do not recommand this\n
+#site_uid = transaction.getSiteUid()\n
\n
-operation_list_object = transaction.Baobab_getRemainingOperationList(site_uid=site_uid, date=current_date, simulation_state=[\'confirmed\',])\n
+#operation_list_object = transaction.Baobab_getRemainingOperationList(site_uid=site_uid, date=current_date, simulation_state=[\'confirmed\',])\n
\n
-for operation in operation_list_object:\n
- context.log(\'cancelling operations\', operation.getRelativeUrl())\n
- operation.reject()\n
+#for operation in operation_list_object:\n
+# operation.reject()\n
</string> </value>
</item>
<item>
@@ -156,9 +157,6 @@
<string>current_date</string>
<string>len</string>
<string>msg</string>
- <string>site_uid</string>
- <string>operation_list_object</string>
- <string>operation</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml Fri Jul 20 12:44:05 2007
@@ -48,34 +48,24 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>AccessContentsInformation</string> </key>
- <value>
- <tuple>
- <string>Assignor</string>
- <string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
@@ -92,8 +82,10 @@
<key> <string>View</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml Fri Jul 20 12:44:05 2007
@@ -48,34 +48,24 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>AccessContentsInformation</string> </key>
- <value>
- <tuple>
- <string>Assignor</string>
- <string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
@@ -92,8 +82,10 @@
<key> <string>View</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml Fri Jul 20 12:44:05 2007
@@ -50,17 +50,14 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
@@ -70,16 +67,7 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>AccessContentsInformation</string> </key>
- <value>
- <tuple>
- <string>Assignee</string>
- <string>Assignor</string>
- <string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
@@ -99,6 +87,7 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml Fri Jul 20 12:44:05 2007
@@ -48,34 +48,24 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>AccessContentsInformation</string> </key>
- <value>
- <tuple>
- <string>Assignor</string>
- <string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
@@ -92,8 +82,10 @@
<key> <string>View</string> </key>
<value>
<tuple>
+ <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
+ <string>Reviewer</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=15261&r1=15260&r2=15261&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Fri Jul 20 12:44:05 2007
@@ -1,1 +1,1 @@
-313
+315
More information about the Erp5-report
mailing list