[Erp5-report] r19057 - in /erp5/trunk/bt5/erp5_banking_check: WorkflowTemplateItem/portal_w...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 5 15:53:15 CET 2008
Author: aurel
Date: Tue Feb 5 15:53:15 2008
New Revision: 19057
URL: http://svn.erp5.org?rev=19057&view=rev
Log:
fix transition security
on check payment, fix control when doing manual validation
Modified:
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/order.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml
erp5/trunk/bt5/erp5_banking_check/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/order.xml?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/order.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/order.xml Tue Feb 5 15:53:15 2008
@@ -44,7 +44,7 @@
<item>
<key> <string>guard</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <none/>
</value>
</item>
<item>
@@ -70,25 +70,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Guard" module="Products.DCWorkflow.Guard"/>
- <tuple/>
- </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_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml Tue Feb 5 15:53:15 2008
@@ -81,7 +81,7 @@
site = transaction.getSourceValue()\n
\n
# For safety, check the consistency again.\n
-context.validateConsistency(state_change)\n
+context.validateConsistency(state_change, no_balance_check=1)\n
\n
line = transaction.movement\n
bank_account = transaction.getDestinationPaymentValue()\n
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml Tue Feb 5 15:53:15 2008
@@ -140,6 +140,9 @@
\n
context.updateBankingOperation(state_change)\n
\n
+if no_balance_check == 1:\n
+ return\n
+\n
# Test if the account balance is sufficient.\n
# We do not need to serialize here because we do not make\n
# reservation yet\n
@@ -171,7 +174,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>state_change, **kw</string> </value>
+ <value> <string>state_change, no_balance_check=0, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -199,13 +202,14 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>state_change</string>
+ <string>no_balance_check</string>
<string>kw</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
@@ -242,7 +246,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <int>0</int>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml Tue Feb 5 15:53:15 2008
@@ -83,7 +83,7 @@
transaction.Baobab_checkCounterOpened(site)\n
\n
# For safety, check the consistency again.\n
-context.validateConsistency(state_change)\n
+context.validateConsistency(state_change, no_balance_check=1)\n
\n
line = transaction.movement\n
bank_account = transaction.getDestinationPaymentValue()\n
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml Tue Feb 5 15:53:15 2008
@@ -38,7 +38,7 @@
<item>
<key> <string>guard</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <none/>
</value>
</item>
<item>
@@ -64,25 +64,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Guard" module="Products.DCWorkflow.Guard"/>
- <tuple/>
- </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_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=19057&r1=19056&r2=19057&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue Feb 5 15:53:15 2008
@@ -1,1 +1,1 @@
-375
+376
More information about the Erp5-report
mailing list