[Erp5-report] r8538 - in /erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_work...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jul 19 11:23:17 CEST 2006
Author: aurel
Date: Wed Jul 19 11:23:08 2006
New Revision: 8538
URL: http://svn.erp5.org?rev=8538&view=rev
Log:
many workflow modifications
Added:
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
Modified:
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml Wed Jul 19 11:23:08 2006
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Confirmed for cash administrator</string> </value>
+ <value> <string>Confirmed By Initiator</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml Wed Jul 19 11:23:08 2006
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Terminate the operation</string> </value>
+ <value> <string>Validated</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml Wed Jul 19 11:23:08 2006
@@ -48,8 +48,8 @@
<tuple>
<string>cancel</string>
<string>cancel_action</string>
- <string>order</string>
- <string>order_action</string>
+ <string>confirm</string>
+ <string>confirm_action</string>
</tuple>
</value>
</item>
@@ -95,6 +95,7 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
+ <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml Wed Jul 19 11:23:08 2006
@@ -100,8 +100,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- <string>DestinationAssignee</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml Wed Jul 19 11:23:08 2006
@@ -92,8 +92,6 @@
<string>Assignor</string>
<string>Manager</string>
<string>Assignee</string>
- <string>DestinationAssignee</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml Wed Jul 19 11:23:08 2006
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Cash Administrator</string> </value>
+ <value> <string>Assign To Controler</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -90,7 +90,8 @@
<value>
<tuple>
<string>Manager</string>
- <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Assign To Cash Administrator </string> </value>
+ <value> <string>Assign To Controler Action</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Cash Administrator Action</string> </value>
+ <value> <string>Assign To Controler Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -89,7 +89,8 @@
<key> <string>roles</string> </key>
<value>
<tuple>
- <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Owner</string>
<string>Manager</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml Wed Jul 19 11:23:08 2006
@@ -89,7 +89,7 @@
<key> <string>roles</string> </key>
<value>
<tuple>
- <string>DestinationAssignee</string>
+ <string>Assignee</string>
<string>Manager</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml Wed Jul 19 11:23:08 2006
@@ -89,7 +89,7 @@
<key> <string>roles</string> </key>
<value>
<tuple>
- <string>DestinationAssignee</string>
+ <string>Assignee</string>
<string>Manager</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml Wed Jul 19 11:23:08 2006
@@ -76,6 +76,19 @@
transaction = state_change.object\n
\n
vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
+\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+ msg = Message(domain = "ui", message="Counter Date is not opened")\n
+ raise ValidationFailed, (msg,)\n
+\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+ msg = Message(domain = "ui", message="Counter is not opened")\n
+ raise ValidationFailed, (msg,)\n
+\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
\n
# Get price and total_price.\n
@@ -141,10 +154,13 @@
<string>_getattr_</string>
<string>transaction</string>
<string>vault</string>
+ <string>date</string>
+ <string>msg</string>
+ <string>site</string>
+ <string>context</string>
<string>resource</string>
<string>amount</string>
<string>total_price</string>
- <string>msg</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml?rev=8538&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml Wed Jul 19 11:23:08 2006
@@ -1,0 +1,164 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PythonScripts.PythonScript</string>
+ <string>PythonScript</string>
+ </tuple>
+ <none/>
+ </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>from Products.ERP5Type.Message import Message\n
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+\n
+object = state_change.object\n
+\n
+if not \'encaisse_des_devises\' in object.getDestination():\n
+ msg = Message(domain="ui", msg="Wrong Destination Selected.")\n
+ raise validationFailed, (msg,)\n
+\n
+object_price = object.getSourceTotalAssetPrice()\n
+line_price = object.getTotalPrice(deliveryLineType=\'Cash Delivery Line\')\n
+\n
+if object_price != line_price:\n
+ msg = Message(domain="ui", msg="Amount differs between document and lines.")\n
+ raise validationFailed, (msg,)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value> <string>Script (Python):/baobab/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>state_change</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>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>state_change</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>Products.DCWorkflow.DCWorkflow</string>
+ <string>ValidationFailed</string>
+ <string>_getattr_</string>
+ <string>object</string>
+ <string>msg</string>
+ <string>validationFailed</string>
+ <string>object_price</string>
+ <string>line_price</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>checkConsistency</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml Wed Jul 19 11:23:08 2006
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
- <value> <string>checkDestination</string> </value>
+ <value> <string>checkConsistency</string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml Wed Jul 19 11:23:08 2006
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assigned To Vault Controler</string> </value>
+ <value> <string>Assigned To Remote Site Vault Controller</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml Wed Jul 19 11:23:08 2006
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Validated</string> </value>
+ <value> <string>Delivered</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml Wed Jul 19 11:23:08 2006
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Assigned To Vault Manager</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
@@ -81,39 +81,39 @@
<item>
<key> <string>Access contents information</string> </key>
<value>
- <list>
+ <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
- <list>
+ <tuple>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
- <list>
+ <tuple>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
- <list>
+ <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>DestinationAssignor</string>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml Wed Jul 19 11:23:08 2006
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Validated By Vault Manager</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
@@ -83,37 +83,37 @@
<item>
<key> <string>Access contents information</string> </key>
<value>
- <list>
+ <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
- <list>
+ <tuple>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
- <list>
+ <tuple>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
- <list>
+ <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
- </list>
+ </tuple>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml Wed Jul 19 11:23:08 2006
@@ -86,6 +86,7 @@
<string>Assignor</string>
<string>DestinationAssignor</string>
<string>DestinationAssignee</string>
+ <string>Assignee</string>
<string>Manager</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml Wed Jul 19 11:23:08 2006
@@ -24,7 +24,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Assign To Remote Site Vault Controler</string> </value>
+ <value> <string>Assign To Remote Site Vault Controller</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Remote Site Vault Controler</string> </value>
+ <value> <string>Assign To Remote Site Vault Controller</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml Wed Jul 19 11:23:08 2006
@@ -24,7 +24,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Assign To Remote Site Vault Controler </string> </value>
+ <value> <string>Assign To Remote Site Vault Controller </string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Remote Site Vault Controler Action</string> </value>
+ <value> <string>Assign To Remote Site Vault Controller Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml Wed Jul 19 11:23:08 2006
@@ -84,7 +84,6 @@
<value>
<tuple>
<string>DestinationAssignee</string>
- <string>Assignee</string>
<string>Manager</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Assign To Remote Site Vault Manager</string> </value>
+ <value> <string>Assign To Remote Site Vault Manager</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Remote Site Vault Manager</string> </value>
+ <value> <string>Assign To Remote Site Vault Manager</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Assign To Remote Site Vault Manager</string> </value>
+ <value> <string>Assign To Remote Site Vault Manager</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assign To Remote Site Vault Manager Action</string> </value>
+ <value> <string>Assign To Remote Site Vault Manager Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Validated By Vault Manager</string> </value>
+ <value> <string>Assign To Vault Controler</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Validated By Vault Manager</string> </value>
+ <value> <string>Assign To Vault Controler</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -91,7 +91,6 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Validated By Vault Manager</string> </value>
+ <value> <string>Assign To Vault Controler</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Validated By Vault Manager Action</string> </value>
+ <value> <string>Assign To Vault Controler Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -91,7 +91,6 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml Wed Jul 19 11:23:08 2006
@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Validated By Vault Controler</string> </value>
+ <value> <string>Validate</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Validated By Vault Controler Action</string> </value>
+ <value> <string>Validate Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml Wed Jul 19 11:23:08 2006
@@ -74,8 +74,20 @@
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change.object\n
+vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
\n
-vault = transaction.getSource()\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+ msg = Message(domain = "ui", message="Counter Date is not opened")\n
+ raise ValidationFailed, (msg,)\n
+\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+ msg = Message(domain = "ui", message="Counter is not opened")\n
+ raise ValidationFailed, (msg,)\n
+\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
\n
# Get price and total_price.\n
@@ -141,10 +153,13 @@
<string>_getattr_</string>
<string>transaction</string>
<string>vault</string>
+ <string>date</string>
+ <string>msg</string>
+ <string>site</string>
+ <string>context</string>
<string>resource</string>
<string>amount</string>
<string>total_price</string>
- <string>msg</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml?rev=8538&r1=8537&r2=8538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml Wed Jul 19 11:23:08 2006
@@ -74,8 +74,19 @@
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change.object\n
+vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+ msg = Message(domain = "ui", message="Counter Date is not opened")\n
+ raise ValidationFailed, (msg,)\n
\n
-vault = transaction.getSource()\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+ msg = Message(domain = "ui", message="Counter is not opened")\n
+ raise ValidationFailed, (msg,)\n
+\n
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
\n
# Get price and total_price.\n
@@ -141,10 +152,13 @@
<string>_getattr_</string>
<string>transaction</string>
<string>vault</string>
+ <string>date</string>
+ <string>msg</string>
+ <string>site</string>
+ <string>context</string>
<string>resource</string>
<string>amount</string>
<string>total_price</string>
- <string>msg</string>
</tuple>
</value>
</item>
More information about the Erp5-report
mailing list