[Erp5-report] r14980 - in /erp5/trunk/bt5/erp5_banking_check: WorkflowTemplateItem/portal_w...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 26 15:52:03 CEST 2007
Author: aurel
Date: Tue Jun 26 15:52:03 2007
New Revision: 14980
URL: http://svn.erp5.org?rev=14980&view=rev
Log:
* change security for manual validation
* better message when validation failed
Added:
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/refuse_action.xml
Modified:
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/accept_action.xml
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/reject_action.xml
erp5/trunk/bt5/erp5_banking_check/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml Tue Jun 26 15:52:03 2007
@@ -101,27 +101,32 @@
for check_operation_line in transaction.contentValues(filter = {\'portal_type\' : \'Check Operation Line\'}):\n
check_number = check_operation_line.getAggregateFreeText()\n
if not check_number:\n
- msg = Message(domain=\'ui\', message=\'Check is not defined.\')\n
+ msg = Message(domain=\'ui\', message=\'Check is not defined on line $line.\'\n
+ , mapping={"line" : line.getId()})\n
raise ValidationFailed, (msg,)\n
\n
check_type = check_operation_line.getAggregateResource()\n
if check_type is None:\n
- msg = Message(domain=\'ui\', message=\'Check type is not defined.\')\n
+ msg = Message(domain=\'ui\', message=\'Check type is not defined on line $line.\'\n
+ , mapping={"line" : line.getId()})\n
raise ValidationFailed, (msg,)\n
\n
\n
source_bank_account = check_operation_line.getSourcePaymentValue()\n
if source_bank_account is None:\n
- msg = Message(domain=\'ui\', message=\'Source bank account not defined.\')\n
+ msg = Message(domain=\'ui\', message=\'Bank account not defined on line $line.\'\n
+ , mapping={"line" : line.getId()})\n
raise ValidationFailed, (msg,)\n
\n
# Test if the account balance is sufficient.\n
error = context.BankAccount_checkBalance(source_bank_account.getRelativeUrl(), check_operation_line.getPrice())\n
if error[\'error_code\'] == 1:\n
- msg = Message(domain=\'ui\', message="Source bank account is not sufficient.")\n
+ msg = Message(domain=\'ui\', message="Bank account $account is not sufficient on line $line.",\n
+ mapping={"account": source_bank_account.getInternalBankAccountNumber, "line" : line.getId()})\n
raise ValidationFailed, (msg,)\n
elif error[\'error_code\'] == 2:\n
- msg = Message(domain=\'ui\', message="source bank account is not valid.")\n
+ msg = Message(domain=\'ui\', message="Bank account $account is not valid on $line.",\n
+ mapping={"account": source_bank_account.getInternalBankAccountNumber, "line" : line.getId()})\n
raise ValidationFailed, (msg,)\n
elif error[\'error_code\'] != 0:\n
msg = Message(domain=\'ui\', message="Unknown error code.")\n
@@ -209,6 +214,7 @@
<string>_getiter_</string>
<string>check_operation_line</string>
<string>check_number</string>
+ <string>line</string>
<string>check_type</string>
<string>source_bank_account</string>
<string>context</string>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml Tue Jun 26 15:52:03 2007
@@ -43,8 +43,6 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
- <string>cancel</string>
- <string>cancel_action</string>
<string>deliver</string>
<string>deliver_action</string>
<string>reject</string>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml Tue Jun 26 15:52:03 2007
@@ -45,10 +45,8 @@
<tuple>
<string>accept</string>
<string>accept_action</string>
- <string>cancel</string>
- <string>cancel_action</string>
+ <string>refuse_action</string>
<string>reject</string>
- <string>reject_action</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/accept_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/accept_action.xml?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/accept_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/accept_action.xml Tue Jun 26 15:52:03 2007
@@ -84,7 +84,6 @@
<value>
<tuple>
<string>Manager</string>
- <string>DestinationAssignor</string>
<string>DestinationAssignee</string>
</tuple>
</value>
Added: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/refuse_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/refuse_action.xml?rev=14980&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/refuse_action.xml (added)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/refuse_action.xml Tue Jun 26 15:52:03 2007
@@ -1,0 +1,94 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
+ </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>Reject</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=refuse_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>reject</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>refuse_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>Refuse 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>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>DestinationAssignee</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/reject_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/reject_action.xml?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/reject_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/reject_action.xml Tue Jun 26 15:52:03 2007
@@ -80,7 +80,6 @@
<string>Manager</string>
<string>Assignee</string>
<string>DestinationAssignor</string>
- <string>DestinationAssignee</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14980&r1=14979&r2=14980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue Jun 26 15:52:03 2007
@@ -1,1 +1,1 @@
-287
+289
More information about the Erp5-report
mailing list