Commit e12ceef6 authored by Aurel's avatar Aurel

change way to know if we go through manual validation or not

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19104 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d8b909b5
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>scripts</string> </value> <value> <string>scripts</string> </value>
......
...@@ -95,12 +95,6 @@ for line in txn.contentValues(filter = {\'portal_type\' : \'Check Operation Lin ...@@ -95,12 +95,6 @@ for line in txn.contentValues(filter = {\'portal_type\' : \'Check Operation Lin
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
......
...@@ -73,12 +73,15 @@ obj = state_change[\'object\']\n ...@@ -73,12 +73,15 @@ obj = state_change[\'object\']\n
wf_h = obj.Base_getWorkflowHistory()\n wf_h = obj.Base_getWorkflowHistory()\n
wf_h = wf_h[\'check_deposit_workflow\'][\'item_list\']\n wf_h = wf_h[\'check_deposit_workflow\'][\'item_list\']\n
\n \n
manual_validation = 0\n
waiting_state = wf_h[3]\n
if waiting_state == "waiting":\n
manual_validation = 1\n
\n \n
context.log("waiting state", waiting_state)\n for h in wf_h:\n
obj.log("state", h[3])\n
if h[3] == "plan":\n
manual_validation = 0\n
break\n
if h[3] == "accept":\n
manual_validation = 1\n
break\n
\n \n
if manual_validation:\n if manual_validation:\n
return\n return\n
...@@ -116,15 +119,9 @@ context.validateSourceAndDestination(state_change)\n ...@@ -116,15 +119,9 @@ context.validateSourceAndDestination(state_change)\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -159,6 +156,7 @@ context.validateSourceAndDestination(state_change)\n ...@@ -159,6 +156,7 @@ context.validateSourceAndDestination(state_change)\n
<value> <value>
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>kw</string>
<string>Products.DCWorkflow.DCWorkflow</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string> <string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string> <string>Products.ERP5Type.Message</string>
...@@ -167,12 +165,12 @@ context.validateSourceAndDestination(state_change)\n ...@@ -167,12 +165,12 @@ context.validateSourceAndDestination(state_change)\n
<string>obj</string> <string>obj</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>wf_h</string> <string>wf_h</string>
<string>manual_validation</string>
<string>waiting_state</string>
<string>context</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>h</string>
<string>manual_validation</string>
<string>check_operation_line</string> <string>check_operation_line</string>
<string>source_bank_account</string> <string>source_bank_account</string>
<string>context</string>
<string>error</string> <string>error</string>
<string>msg</string> <string>msg</string>
</tuple> </tuple>
......
...@@ -106,12 +106,6 @@ line.setDestinationPaymentValue(transaction.getDestinationPaymentValue())\n ...@@ -106,12 +106,6 @@ line.setDestinationPaymentValue(transaction.getDestinationPaymentValue())\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
......
...@@ -94,12 +94,6 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\' ...@@ -94,12 +94,6 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\'
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
......
...@@ -84,12 +84,6 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\' ...@@ -84,12 +84,6 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\'
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
......
...@@ -183,12 +183,6 @@ if transaction.getSimulationState() == "draft" and state_change[\'transition\']. ...@@ -183,12 +183,6 @@ if transaction.getSimulationState() == "draft" and state_change[\'transition\'].
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
......
...@@ -85,12 +85,6 @@ context.validateConsistency(state_change)\n ...@@ -85,12 +85,6 @@ context.validateConsistency(state_change)\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change, **kw</string> </value> <value> <string>state_change, **kw</string> </value>
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>states</string> </value> <value> <string>states</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Possibility should be given through special script code to cancel payment (and before that, allow modifications)</string> </value> <value> <string>Possibility should be given through special script code to cancel payment (and before that, allow modifications)</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value> <value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Documents in this state have been confirmed to emanate from the right agent (signature) and contain consistent information</string> </value> <value> <string>Documents in this state have been confirmed to emanate from the right agent (signature) and contain consistent information</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>transitions</string> </value> <value> <string>transitions</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
...@@ -44,7 +38,7 @@ ...@@ -44,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -70,4 +64,25 @@ ...@@ -70,4 +64,25 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value> <value> <string>workflow</string> </value>
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>variables</string> </value> <value> <string>variables</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>default_expr</string> </key>
<value> <value>
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>worklists</string> </value> <value> <string>worklists</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>global</string> </value> <value> <string>global</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>global</string> </value> <value> <string>global</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>global</string> </value> <value> <string>global</string> </value>
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>global</string> </value> <value> <string>global</string> </value>
......
379 380
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment