[Erp5-report] r12152 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 19 09:49:09 CET 2007
Author: seb
Date: Fri Jan 19 09:48:48 2007
New Revision: 12152
URL: http://svn.erp5.org?rev=12152&view=rev
Log:
make sure that the we will take into accont new stock value with account incident
Added:
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver_action.xml
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_deficit_price.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_excess_price.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_init.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineFastInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingAccountIncidentLine_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingAccountIncidentLine_getBaobabSource.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/updateBankingOperation.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/confirmed.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_deficit_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_deficit_price.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_deficit_price.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_deficit_price.xml Fri Jan 19 09:48:48 2007
@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Account Incident Line\')</string> </value>
+ <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Account Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_excess_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_excess_price.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_excess_price.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncidentModule_viewAccountIncidentList/listbox_excess_price.xml Fri Jan 19 09:48:48 2007
@@ -269,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Outgoing Account Incident Line\')</string> </value>
+ <value> <string>python: cell.getTotalPrice(deliveryLineType=\'Incoming Account Incident Line\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_init.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_init.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_init.xml Fri Jan 19 09:48:48 2007
@@ -70,6 +70,13 @@
<key> <string>_body</string> </key>
<value> <string>user_site = context.Baobab_getUserAssignedRootSiteList()[0]\n
context.edit(source=user_site)\n
+transaction = context\n
+\n
+movement = transaction.newContent(portal_type=\'Banking Operation Line\',\n
+ id=\'movement\',\n
+ source=\'account_module/bank_account\', # Set default source\n
+ destination=\'account_module/bank_account\', # Set default destination\n
+ )\n
</string> </value>
</item>
<item>
@@ -124,6 +131,8 @@
<string>_getattr_</string>
<string>context</string>
<string>user_site</string>
+ <string>transaction</string>
+ <string>movement</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineFastInputDialog.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineFastInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/AccountIncident_viewOutgoingLineFastInputDialog.xml Fri Jan 19 09:48:48 2007
@@ -72,7 +72,7 @@
\n
cash_detail_dict = {\'line_portal_type\' : \'Outgoing Account Incident Line\'\n
, \'operation_currency\' : context.Baobab_getPortalReferenceCurrencyID()\n
- , \'cash_status_list\' : [\'to_sort\']\n
+ , \'cash_status_list\' : [\'valid\',\'new_emitted\']\n
, \'emission_letter_list\' : None\n
, \'variation_list\' : context.Baobab_getResourceVintageList(banknote=1, coin=1)\n
, \'currency_cash_portal_type\': None\n
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingAccountIncidentLine_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingAccountIncidentLine_getBaobabDestination.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingAccountIncidentLine_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingAccountIncidentLine_getBaobabDestination.xml Fri Jan 19 09:48:48 2007
@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>return "%s/surface/salle_tri/encaisse_des_differences" %(context.getSource(),)\n
+ <value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml Fri Jan 19 09:48:48 2007
@@ -197,7 +197,7 @@
\'/\' + head_start_date_string[0:2] + \' 0:0am\'\n
head_start_date = DateTime(head_start_date_string )\n
except:\n
- return {\'error\':True, \'message\':"message_dict[\'01\']", \'head_dict\':{}}\n
+ return {\'error\':True, \'message\':message_dict[\'01\'], \'head_dict\':{}}\n
#\n
\n
head_resource_string = (head_resource_string or \'\').strip()\n
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml Fri Jan 19 09:48:48 2007
@@ -71,20 +71,24 @@
<value> <string>destination = context.getDestination()\n
baobab_destination = None\n
# Get the history of the workflow\n
-user_id=None\n
-for workflow_item in context.Base_getWorkflowHistoryItemList(\'money_deposit_workflow\',display=0):\n
- if workflow_item.getProperty(\'action\')==\'deliver_action\':\n
- user_id=workflow_item.getProperty(\'actor\')\n
-site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
-for site in site_list:\n
- site_value = context.portal_categories.getCategoryValue(site)\n
- if site_value.getVaultType().endswith(\'guichet\') and destination in site:\n
- baobab_destination = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
- break\n
-if user_id is not None and baobab_destination is None:\n
- from Products.ERP5Type.Message import Message\n
- message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
- raise ValueError,message\n
+if destination is not None:\n
+ user_id=None\n
+ for workflow_item in context.Base_getWorkflowHistoryItemList(\'money_deposit_workflow\',display=0):\n
+ if workflow_item.getProperty(\'action\')==\'deliver_action\':\n
+ user_id=workflow_item.getProperty(\'actor\')\n
+ site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
+ context.log(\'MoneyDeposit_getBaobabDestination, site_list\',site_list)\n
+ for site in site_list:\n
+ site_value = context.portal_categories.getCategoryValue(site)\n
+ context.log(\'MoneyDeposit_getBaobabDestination, destination\',destination)\n
+ context.log(\'MoneyDeposit_getBaobabDestination, site\',site)\n
+ if site_value.getVaultType().endswith(\'guichet\') and destination in site:\n
+ baobab_destination = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
+ break\n
+ if user_id is not None and baobab_destination is None:\n
+ from Products.ERP5Type.Message import Message\n
+ message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
+ raise ValueError,message\n
return baobab_destination\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingAccountIncidentLine_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingAccountIncidentLine_getBaobabSource.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingAccountIncidentLine_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingAccountIncidentLine_getBaobabSource.xml Fri Jan 19 09:48:48 2007
@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>return "%s/surface/salle_tri/encaisse_des_differences" %(context.getSource(),)\n
+ <value> <string>return "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(context.getSource(),)\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml Fri Jan 19 09:48:48 2007
@@ -75,9 +75,29 @@
from Products.ERP5Type.Message import Message\n
\n
txn = state_change[\'object\']\n
+\n
+user_id = txn.portal_membership.getAuthenticatedMember().getUserName()\n
+site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
+# context.log(\'validateVaultBalance site_list\',site_list)\n
+source = txn.getSource()\n
+baobab_source = None\n
+for site in site_list:\n
+ site_value = context.portal_categories.getCategoryValue(site)\n
+ if site_value.getVaultType().endswith(\'guichet\') and source in site:\n
+ baobab_source = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
+ break\n
+source = baobab_source\n
+source_object = context.portal_categories.getCategoryValue(source)\n
+\n
+# check again that we are in the good accounting date\n
+if not txn.Baobab_checkCounterDateOpen(site=source_object, date=txn.getStartDate()):\n
+ msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
+ raise ValidationFailed, (msg,)\n
+\n
+\n
in_list = txn.objectValues(portal_type=\'Incoming Account Incident Line\')\n
out_list = txn.objectValues(portal_type=\'Outgoing Account Incident Line\')\n
-vault = "%s/surface/salle_tri/encaisse_des_differences" %(txn.getSource(),)\n
+vault = "%s/surface/caisse_courante/encaisse_des_billets_et_monnaies" %(txn.getSource(),)\n
price = txn.getSourceTotalAssetPrice()\n
in_price = txn.getTotalPrice(portal_type=[\'Incoming Account Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
out_price = txn.getTotalPrice(portal_type=[\'Outgoing Account Incident Line\',\'Cash Delivery Cell\'],fast=0)\n
@@ -149,6 +169,17 @@
<string>_getitem_</string>
<string>txn</string>
<string>_getattr_</string>
+ <string>user_id</string>
+ <string>context</string>
+ <string>site_list</string>
+ <string>source</string>
+ <string>None</string>
+ <string>baobab_source</string>
+ <string>_getiter_</string>
+ <string>site</string>
+ <string>site_value</string>
+ <string>source_object</string>
+ <string>msg</string>
<string>in_list</string>
<string>out_list</string>
<string>vault</string>
@@ -156,7 +187,6 @@
<string>in_price</string>
<string>out_price</string>
<string>len</string>
- <string>msg</string>
<string>resource</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/updateBankingOperation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/updateBankingOperation.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/updateBankingOperation.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/updateBankingOperation.xml Fri Jan 19 09:48:48 2007
@@ -73,12 +73,15 @@
price = transaction.getSourceTotalAssetPrice()\n
line = transaction.get(\'movement\')\n
\n
-if (): \n
+in_list = transaction.objectValues(portal_type=\'Incoming Account Incident Line\')\n
+out_list = transaction.objectValues(portal_type=\'Outgoing Account Incident Line\')\n
+\n
+if (len(in_list)!= 0): \n
if line is not None and line.getPortalType() == \'Banking Operation Line\':\n
# This is a single currency operation, so it is not necessary to convert the price.\n
line.setSourceCredit(price)\n
\n
-elif () :\n
+elif (len(out_list) != 0) :\n
line = transaction.get(\'movement\')\n
if line is not None and line.getPortalType() == \'Banking Operation Line\':\n
# This is a single currency operation, so it is not necessary to convert the price.\n
@@ -146,6 +149,9 @@
<string>bank_account</string>
<string>price</string>
<string>line</string>
+ <string>in_list</string>
+ <string>out_list</string>
+ <string>len</string>
<string>None</string>
</tuple>
</value>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,54 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.States</string>
+ <string>StateDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>cancelled</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Cancelled</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,59 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.States</string>
+ <string>StateDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>confirmed</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Confirmed</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple>
+ <string>cancel</string>
+ <string>cancel_action</string>
+ <string>deliver</string>
+ <string>deliver_action</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,54 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.States</string>
+ <string>StateDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>delivered</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Delivered</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml Fri Jan 19 09:48:48 2007
@@ -40,8 +40,10 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
- <string>plan</string>
- <string>plan_action</string>
+ <string>cancel</string>
+ <string>cancel_action</string>
+ <string>confirm</string>
+ <string>confirm_action</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string>cancelled</string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>cancel_action</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>updateBankingOperation</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>confirm</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string>confirmed</string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Send To Validation</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Send To Validation</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=confirm_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>confirm</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>confirm_action</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string>checkConsistency</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Send To Validation Action</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>deliver</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string>delivered</string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Validate</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignee</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver_action.xml?rev=12152&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver_action.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/deliver_action.xml Fri Jan 19 09:48:48 2007
@@ -1,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Transitions</string>
+ <string>TransitionDefinition</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Validate</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=deliver_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>deliver</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>deliver_action</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string>validateSourceAndDestination</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Validate Action</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.DCWorkflow.Guard</string>
+ <string>Guard</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignee</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml Fri Jan 19 09:48:48 2007
@@ -109,7 +109,7 @@
<key> <string>simulation_state</string> </key>
<value>
<tuple>
- <string>planned</string>
+ <string>confirmed</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.xml Fri Jan 19 09:48:48 2007
@@ -73,9 +73,30 @@
\n
transaction = state_change[\'object\']\n
\n
-source = transaction.getSource()\n
-resource = transaction.CashDelivery_checkCounterInventory(source = source, portal_type=\'Cash Delivery Line\', no_balance_check=1)\n
+destination = transaction.getDestination()\n
+resource = transaction.CashDelivery_checkCounterInventory(source = destination, portal_type=\'Cash Delivery Line\', \n
+ same_source=1,no_balance_check=1)\n
#transaction.log("call to CashDelivery_getCounterInventory return", resource)\n
+\n
+\n
+user_id = transaction.portal_membership.getAuthenticatedMember().getUserName()\n
+site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
+# context.log(\'validateVaultBalance site_list\',site_list)\n
+destination = transaction.getDestination()\n
+baobab_destination = None\n
+for site in site_list:\n
+ site_value = context.portal_categories.getCategoryValue(site)\n
+ if site_value.getVaultType().endswith(\'guichet\') and destination in site:\n
+ baobab_destination = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
+ break\n
+destination = baobab_destination\n
+destination_object = context.portal_categories.getCategoryValue(destination)\n
+\n
+# check again that we are in the good accounting date\n
+if not transaction.Baobab_checkCounterDateOpen(site=destination_object, date=transaction.getStartDate()):\n
+ msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
+ raise ValidationFailed, (msg,)\n
+\n
\n
# Get price and total_price.\n
price = transaction.getSourceTotalAssetPrice()\n
@@ -146,11 +167,20 @@
<string>_getitem_</string>
<string>transaction</string>
<string>_getattr_</string>
- <string>source</string>
+ <string>destination</string>
<string>resource</string>
+ <string>user_id</string>
+ <string>context</string>
+ <string>site_list</string>
+ <string>None</string>
+ <string>baobab_destination</string>
+ <string>_getiter_</string>
+ <string>site</string>
+ <string>site_value</string>
+ <string>destination_object</string>
+ <string>msg</string>
<string>price</string>
<string>cash_detail</string>
- <string>msg</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/confirmed.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/confirmed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/states/confirmed.xml Fri Jan 19 09:48:48 2007
@@ -46,6 +46,8 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
+ <string>cancel</string>
+ <string>cancel_action</string>
<string>deliver</string>
<string>deliver_action</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.xml?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.xml Fri Jan 19 09:48:48 2007
@@ -77,6 +77,11 @@
date = transaction.getStartDate()\n
vault = transaction.getSource()\n
vaultDestination = transaction.getDestination()\n
+\n
+# use of the constraint\n
+vliste = transaction.checkConsistency()\n
+if len(vliste) != 0:\n
+ raise ValidationFailed, (vliste[0].getTranslatedMessage(),)\n
\n
# check we are in an opened accounting day\n
if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
@@ -158,6 +163,9 @@
<string>date</string>
<string>vault</string>
<string>vaultDestination</string>
+ <string>vliste</string>
+ <string>len</string>
+ <string>_getitem_</string>
<string>msg</string>
<string>resource</string>
<string>amount</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=12152&r1=12151&r2=12152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Jan 19 09:48:48 2007
@@ -1,1 +1,1 @@
-141
+144
More information about the Erp5-report
mailing list