[Erp5-report] r24424 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 30 15:18:15 CET 2008
Author: aurel
Date: Thu Oct 30 15:18:12 2008
New Revision: 24424
URL: http://svn.erp5.org?rev=24424&view=rev
Log:
- display reception date in right workflow state
- allow people from source site to cancel a document sent to a remote site
Added:
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/revoke_action.xml
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view/my_stop_date.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/started.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/stopped.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/reject_action.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view/my_stop_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view/my_stop_date.xml?rev=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view/my_stop_date.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryDestruction_view/my_stop_date.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -225,6 +225,10 @@
</item>
<item>
<key> <string>time_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>timezone_style</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -482,7 +486,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getSimulationState() in (\'ordered\', \'confirmed\', \'delivered\')</string> </value>
+ <value> <string>python: here.getSimulationState() in (\'stopped\', \'delivered\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/started.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/started.xml?rev=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/started.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/started.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -43,6 +43,8 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
+ <string>cancel</string>
+ <string>revoke_action</string>
<string>stop</string>
<string>stop_action</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/stopped.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/stopped.xml?rev=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/stopped.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/stopped.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -43,7 +43,9 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
+ <string>cancel</string>
<string>deliver</string>
+ <string>revoke_action</string>
<string>stop_to_deliver_action</string>
</tuple>
</value>
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=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -78,8 +78,6 @@
<value>
<tuple>
<string>Assignor</string>
- <string>DestinationAssignor</string>
- <string>DestinationAssignee</string>
<string>Assignee</string>
<string>Manager</string>
<string>Assistant</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/reject_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/reject_action.xml?rev=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/reject_action.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/reject_action.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -79,8 +79,6 @@
<tuple>
<string>Assignor</string>
<string>Assignee</string>
- <string>DestinationAssignor</string>
- <string>DestinationAssignee</string>
<string>Manager</string>
</tuple>
</value>
Added: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/revoke_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/revoke_action.xml?rev=24424&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/revoke_action.xml (added)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/revoke_action.xml [utf8] Thu Oct 30 15:18:12 2008
@@ -1,0 +1,95 @@
+<?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>Cancel</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=revoke_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>cancel</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>revoke_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>Cancel</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>Assignee</string>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=24424&r1=24423&r2=24424&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] Thu Oct 30 15:18:12 2008
@@ -1,1 +1,1 @@
-639
+641
More information about the Erp5-report
mailing list