[Erp5-report] r15799 - in /erp5/trunk/bt5/erp5_banking_cash: WorkflowTemplateItem/portal_wo...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 24 10:10:04 CEST 2007
Author: aurel
Date: Fri Aug 24 10:10:03 2007
New Revision: 15799
URL: http://svn.erp5.org?rev=15799&view=rev
Log:
workflow state/transition title change
fix wf for dematerialization
Modified:
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.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_to_deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver_action.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml Fri Aug 24 10:10:03 2007
@@ -61,7 +61,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Terminate the operation</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -73,11 +73,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver_action.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver_action.xml Fri Aug 24 10:10:03 2007
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Delivered</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -73,11 +73,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/states/delivered.xml Fri Aug 24 10:10:03 2007
@@ -37,7 +37,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Terminate the operation</string> </value>
+ <value> <string>Delivered</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver.xml Fri Aug 24 10:10:03 2007
@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Delivered</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver_action.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/transitions/deliver_action.xml Fri Aug 24 10:10:03 2007
@@ -21,7 +21,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Delivered</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml Fri Aug 24 10:10:03 2007
@@ -71,9 +71,8 @@
from Products.ERP5Type.Message import Message\n
\n
transaction = state_change[\'object\']\n
-\n
+transaction.log("transaction", "validateVaultBalance")\n
vault = transaction.getSource()\n
-resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Monetary Destruction Line\')\n
\n
source_object = context.portal_categories.getCategoryValue(vault)\n
\n
@@ -94,23 +93,11 @@
\n
\n
\n
-# Get price and total_price.\n
-amount = transaction.getSourceTotalAssetPrice()\n
-total_price = transaction.getTotalPrice(portal_type=[\'Monetary Destruction Line\',\'Monetary Destruction Cell\'],fast=0)\n
-\n
-if resource == 2:\n
- msg = Message(domain="ui", message="No Resource.")\n
- raise ValidationFailed, (msg,)\n
-elif amount != total_price:\n
- msg = Message(domain="ui", message="Amount differ from total price.")\n
- raise ValidationFailed, (msg,)\n
-elif resource <> 0 :\n
- msg = Message(domain="ui", message="Insufficient Balance.")\n
- raise ValidationFailed, (msg,)\n
-\n
# In case of dematerialization, we must have only coins\n
+transaction.log("isDematerialization", transaction.isDematerialization())\n
if transaction.isDematerialization():\n
- for line in transaction.objectValues(portal_type=\'Cash Delivery Line\'):\n
+ for line in transaction.objectValues(portal_type=\'Monetary Destruction Line\'):\n
+ transaction.log("line", line.getResourceValue().getPortalType())\n
if line.getResourceValue().getPortalType() != \'Coin\':\n
msg = Message(domain="ui", message="Sorry, dematerialization is possible only with coins.")\n
raise ValidationFailed, (msg,)\n
@@ -122,6 +109,22 @@
if not \'encaisse_des_billets_retires_de_la_circulation\' in vault:\n
msg = Message(domain="ui", message="Invalid source.")\n
raise ValidationFailed, (msg,)\n
+\n
+\n
+# Get price and total_price.\n
+amount = transaction.getSourceTotalAssetPrice()\n
+total_price = transaction.getTotalPrice(portal_type=[\'Monetary Destruction Line\',\'Monetary Destruction Cell\'],fast=0)\n
+resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Monetary Destruction Line\')\n
+\n
+if resource == 2:\n
+ msg = Message(domain="ui", message="No Resource.")\n
+ raise ValidationFailed, (msg,)\n
+elif amount != total_price:\n
+ msg = Message(domain="ui", message="Amount differ from total price.")\n
+ raise ValidationFailed, (msg,)\n
+elif resource <> 0 :\n
+ msg = Message(domain="ui", message="Insufficient Balance.")\n
+ raise ValidationFailed, (msg,)\n
]]></string> </value>
@@ -177,16 +180,16 @@
<string>transaction</string>
<string>_getattr_</string>
<string>vault</string>
- <string>resource</string>
<string>context</string>
<string>source_object</string>
<string>msg</string>
<string>source_section</string>
<string>None</string>
+ <string>_getiter_</string>
+ <string>line</string>
<string>amount</string>
<string>total_price</string>
- <string>_getiter_</string>
- <string>line</string>
+ <string>resource</string>
</tuple>
</value>
</item>
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=15799&r1=15798&r2=15799&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 Fri Aug 24 10:10:03 2007
@@ -108,7 +108,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: \'externe\' in here.getSource() or here.isDematerialization()</string> </value>
+ <value> <string>python: \'externe\' in here.getSource() or not here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
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=15799&r1=15798&r2=15799&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 Fri Aug 24 10:10:03 2007
@@ -108,7 +108,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: \'externe\' not in here.getSource() and not here.isDematerialization()</string> </value>
+ <value> <string>python: \'externe\' not in here.getSource() and here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver.xml Fri Aug 24 10:10:03 2007
@@ -61,7 +61,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Delivered</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver_action.xml?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/transitions/deliver_action.xml Fri Aug 24 10:10:03 2007
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Delivered</string> </value>
+ <value> <string>Deliver</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=15799&r1=15798&r2=15799&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Aug 24 10:10:03 2007
@@ -1,1 +1,1 @@
-476
+479
More information about the Erp5-report
mailing list