From acbc0514b21e084254e54e4690bd9bc8049adfad Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Fri, 3 Aug 2007 09:41:38 +0000
Subject: [PATCH] updates conditions on workflow tansitions in order to take
into account "dematerialization"
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15443 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../transitions/order_action.xml | 16 +++++-----------
.../transitions/plan_to_deliver_action.xml | 2 +-
bt5/erp5_banking_cash/bt/revision | 2 +-
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
index 4c4072d017..266a33241a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
@@ -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>
@@ -103,18 +100,15 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: \'externe\' in here.getSource()</string> </value>
+ <value> <string>python: \'externe\' in here.getSource() or here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
index 47c6f1fa20..ea8f83affb 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
@@ -108,7 +108,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: \'externe\' not in here.getSource()</string> </value>
+ <value> <string>python: \'externe\' not in here.getSource() and not here.isDematerialization()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision
index 4991210660..13ef0a79b8 100644
--- a/bt5/erp5_banking_cash/bt/revision
+++ b/bt5/erp5_banking_cash/bt/revision
@@ -1 +1 @@
-451
\ No newline at end of file
+453
\ No newline at end of file
--
2.30.9