diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts.xml
index 0622b3c34fa5ffe83ab080066492f760b230dadf..072c8f6540c07806bee17a34c920ec09b2de1bd5 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
index ebecad1e9e48b836b4c2eb635cb2e0af0d02e713..4d74d3326763ec143d1a1df14656758342b8ae98 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@ order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(\n
 order_portal_type = order.getPortalType()\n
 if order_portal_type == \'Open Sale Order\':\n
   delivery_builder = order.portal_deliveries.sale_order_builder\n
-  delivery_builder.activate(activity=\'SQLQueue\', after_tag=expand_tag).build(explanation_uid=order.getUid())\n
+  delivery_builder.activate(activity=\'SQLQueue\', after_tag=(expand_tag, tag)).build(explanation_uid=order.getUid())\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_validateData.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_validateData.xml
index 60a8e383dd98c5f93c943fefe59f597b1dc587df..9e86f9e1a36ea7bb528d688ee4cdf3eb289b7e60 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_validateData.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_validateData.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states.xml
index a21bb6e95907daaaa25a050ce309600283726693..27ec9069024e0f59bf4b612113789f37da98879b 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="States" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="States" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/auto_planned.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/auto_planned.xml
index c96f908f4a1b10c6e2558a7a96883ee0ff24e5f7..aec377048d01d7e7781af909653aa165bac20700 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/auto_planned.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/auto_planned.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -51,10 +48,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/cancelled.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/cancelled.xml
index c901e595d4e51f597795b14b644edc551b38b526..e541b4840becd443183f06af2b8861331ea2851d 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/cancelled.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/cancelled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -46,10 +43,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/deleted.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/deleted.xml
index 8d196c03a52b728f6da79028b464e5708b95a0db..d4bf406f4d065f3e565a3cc0cdf330ceceb37c26 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/deleted.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/deleted.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/draft.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/draft.xml
index 267d2d234679be16785adc06567b7e3d14608697..5d9d21ed3f5e7c3084b69efd42116d0b775ad14f 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/draft.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/draft.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -58,10 +55,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/offered.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/offered.xml
index 5dadc3e08bf8b5e8c02bf1337c841d90998460ee..1c162ca917ac8e611462c1e86f6033318e1df0aa 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/offered.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/offered.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -49,10 +46,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/ordered.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/ordered.xml
index 156728596d5e1615dceae53b2530c855e656f638..1cc0b381a5e8c7c58ba0b1d8a652576f455e86cc 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/ordered.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/ordered.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -52,10 +49,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/planned.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/planned.xml
index 2f5f68aa4b8dc746ecf088c9663eca8415c22cc4..de0b140081a26141947342e5f86dba82e80a7f38 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/planned.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/planned.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -52,10 +49,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/rejected.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/rejected.xml
index 64bf58ca3914344ca3a8a92c8ac4b838def5c952..4cf752b728db254363d903450199a7595f675ac2 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/rejected.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/rejected.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/started.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/started.xml
index b4139b951bfaf331f56528abc2f2fc15586ee1a0..579aa3f6b98b46f1daeca1186c5ffb3a95c6af8f 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/started.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/started.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/stopped.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/stopped.xml
index 9b2bbca6c4df30a36d0d68285273dc0b27e5cb9d..9b5ce8d0d57985783bbb2680e8b78128474bb607 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/stopped.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/stopped.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/suspended.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/suspended.xml
index 6ab3da863be2cce4fc38c640f4b54ddc125fa00a..269c779aa60fde6fecdcdc7f9f966ed3acb7adc0 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/suspended.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/suspended.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -47,10 +44,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions.xml
index 092a5b48f6f98be184d86f13a78513a159cfd129..aa36144efed916b804f5f80df9452b1e3166bdec 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/accept_offer_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/accept_offer_action.xml
index 7233a78e447c89ea2f7ab8fcf535ae412ffdc5a7..0fc8f9964c8e2d632c7ddfd4976de1d84303c65b 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/accept_offer_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/accept_offer_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_order_periodically.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_order_periodically.xml
index 67ffa0af7de94d430c7843686c505b20e87bf566..70aabc98fcfe05930642c1a5c3404220cddef32d 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_order_periodically.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_order_periodically.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_plan.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_plan.xml
index 4a247d344ca8817dc490c122c56737b2696f8c27..b768718a5d29a287d20f984a6acd2f8be3a09463 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_plan.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_plan.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel.xml
index 7bd1da205fab45774b7aef361aeb58e1913fd395..fd5a605afbc03735349a1a1ce641d677ea2d90b7 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel_action.xml
index 51dbf8114ff909afc0a23349d16dd83079d7f45d..3edd86c03dfb88652d5a9cf4d1126acb511c68b3 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete.xml
index 59062841e2bdc78593967d59ff7eae335a4e16a6..e82b3df4b19e965b33e3ae4de2df5412a67103cc 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete_action.xml
index 62bc3ae6dab9cef661e120e7145bda36bd1c25e1..39d59491e6b0e66a05c265c636b60c649709e44e 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/delete_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer.xml
index f1991da7012f7f86106ebe1de67b9f92abcc5b6b..3fbd4c64b6ca759c76345a933b1f983921f24519 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer_action.xml
index 7bd5f80b0b03a34d283d371b11132993bd407150..a223458108c207f29407f2836f6e22cfb6abbccf 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order.xml
index 490164e559f93e8bbfc4f6beab38dffcdc43388a..08b9c50565d1f384797a43030061fa4a3c3875bb 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order_action.xml
index 8ee7754c1154253eae0970fc9220dbd439883eb6..6f1f2fe58caa045cd8bea3ef8046187d31bca063 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan.xml
index 4b59267f163d36195f9912fda3aec5696843d822..f82594780b045cd5110ba9c3d3670aea5ba706e8 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan_action.xml
index 3b0178461f4c390ce965e68a2d69db5948f4f6e1..7a464073251e7b3003fe79948ea194d57450ca52 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject.xml
index 3e12b2cad6c5f87a97912b8c4a11dde5ae7da0f8..120c14fbac30768e01da7965a87eea01d60efcbb 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject_action.xml
index c35d8b2ced7e1e4719937672aee4735ed4fb1933..5815fa70814be451444e63e393447c307c3b9f16 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/reject_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start.xml
index 285f07189c6d9e81bc5b4f6ac1d54d36a40673ed..62956db5f80b6968a2bafa856e2b050b7a07d1ae 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start_action.xml
index a1b71700e855a2e07fe0a48bcdabf14e7ff52853..0ee0c3ae729a4d900bfb82374b848d45ce948635 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop.xml
index adf3a9bd108cf58a774b6235810827642af97a55..af24a41f502298029c09e2d8400893412bcbded7 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop_action.xml
index 3976684d2b3e8d079e697f4306bdf631eb16deeb..11880ca164a8e23541dee50961d011416eee5d23 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend.xml
index a69dafb176bc358a60b77f87bb630aa50323b290..bc2c282fd4a6a6f0b8f416a38ca4e3da8a820722 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend_action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend_action.xml
index c48e4b9762ce4b9a2d4aadd128cc4907dac15ead..d152940344d2493d6895ed716858170bb0a7c571 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend_action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables.xml
index a067e6fbbe0c9a5db3778dc414d3acdd4ead9200..bb12bef805f190ec50e023368d6ee5c6c990b816 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/action.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/action.xml
index ed306eb6affcbce508caa0746aada06c86eb8272..e00c8713348bce7b6fe4178219a5ec5ae633c413 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/action.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml
index d2b89d60519ee166ba66cbdd3119f04a3a865692..493f0994f7b3cba6a09ae9691df927ec5eafc050 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/comment.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/comment.xml
index 999beb2edb541d979d837dd7cf33360dd5af14c9..73cd2e791368af4a8e45c18b443bdc7ce1044318 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/comment.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/comment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/error_message.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/error_message.xml
index e89715783d8e9aab79e87a4193985b507d114cf8..69512a44bc5967c8c56eb45fa88a452ba0c388be 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/error_message.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/error_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/history.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/history.xml
index d7bca55728c5667dd7e6ba0edfd9b2e7c9480e02..e0fe339d69806e85c8cb3e1022cb1911912fad0e 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/history.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/portal_type.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/portal_type.xml
index a874ecc8bb59a4bc6d87c1dd05677fec81834532..521a53aa171520987084020ee19ce4a8d48a40dc 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/portal_type.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/time.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/time.xml
index 0364a3b135d75a07c7b61e3a106a254f0cfc1c5f..5ae6932d9904ddbf87ab731c4188bdcf279f62ba 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/time.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists.xml
index 40787ac9e478b55f5da1edb9a18df61d78e1f459..c7242ee1148db07bda32db11056a3ebf57c34632 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/1_draft_open_sale_order_list.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/1_draft_open_sale_order_list.xml
index 1d6ff1fdb5bdf5ef27a6d69ec9c5f7f261366538..df26ef0cc1a1a612edd2c756ba3b3ca164565d64 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/1_draft_open_sale_order_list.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/1_draft_open_sale_order_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -71,10 +65,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/2_auto_planned_open_sale_order_list.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/2_auto_planned_open_sale_order_list.xml
index d476b257f02751fee418423093db0716d6a84ae8..ff8c146beffd4eb62c3bb6c8ef6236c5495758e0 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/2_auto_planned_open_sale_order_list.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/2_auto_planned_open_sale_order_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/3_planned_open_sale_order_list.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/3_planned_open_sale_order_list.xml
index f6bb7278185b4cf7ebf98bf5e6f1747014a84e92..90d57d482e3184b6f5d092ab327db8a8de1eb99b 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/3_planned_open_sale_order_list.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/3_planned_open_sale_order_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ sale_order_module/view?simulation_state=planned&portal_type=Open+Sale+Order&loca
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ sale_order_module/view?simulation_state=planned&portal_type=Open+Sale+Order&loca
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/4_ordered_open_sale_order_list.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/4_ordered_open_sale_order_list.xml
index a85b771c9c48ef2480596ef4412df1a97ce520cc..a98d2716bac035137dd9c35f12b2fea36866a53a 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/4_ordered_open_sale_order_list.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/4_ordered_open_sale_order_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ sale_order_module/view?simulation_state=ordered&portal_type=Open+Sale+Order&loca
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ sale_order_module/view?simulation_state=ordered&portal_type=Open+Sale+Order&loca
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/5_offered_open_sale_order_list.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/5_offered_open_sale_order_list.xml
index c3ce49372b3d4664bc163d9dd1363777aa62dd55..d99f38425a39457f735eb8ab8e3b59e616507436 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/5_offered_open_sale_order_list.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/5_offered_open_sale_order_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ sale_order_module/view?simulation_state=offered&portal_type=Open+Sale+Order&loca
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -71,10 +65,7 @@ sale_order_module/view?simulation_state=offered&portal_type=Open+Sale+Order&loca
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_open_trade/bt/change_log b/bt5/erp5_open_trade/bt/change_log
index 848c72a4c8ac27a489ed7559acf6574a50f6762e..a375f4075d4f0207870c5820b68d1737b70db153 100644
--- a/bt5/erp5_open_trade/bt/change_log
+++ b/bt5/erp5_open_trade/bt/change_log
@@ -1,3 +1,6 @@
+2010-10-19 yo
+* Have the builder to wait for updateAppliedRule as well, otherwise it fails randomly.
+
 2010-05-24 kazuhiko
 * Improve activity dependencies for Delivery_updateAppliedRule, eg. delivery.activate(tag='(path)_updateAppliedRule', after_tag='(path)_expand').Delivery_updateAppliedRule(activate_kw={'tag':'(path)_expand'})
 
diff --git a/bt5/erp5_open_trade/bt/revision b/bt5/erp5_open_trade/bt/revision
index 368f89ceef179cc546403ac0d5ef1d0e4b340447..b74e882ae378d7e5aae630f48c20dd1e40186d98 100644
--- a/bt5/erp5_open_trade/bt/revision
+++ b/bt5/erp5_open_trade/bt/revision
@@ -1 +1 @@
-28
\ No newline at end of file
+31
\ No newline at end of file