diff --git a/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
index 926cecca9470fe6ef9b1ebd20cd18f02537c9f72..3be34251c8000e87d1a8326b6aa93f1f2e1a66af 100644
--- a/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
+++ b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 78dfe5c312c2edba17eb29652d5c8156e8e58024..01a514913533b063e6e1dafc16e9e70a009b8717 100644
--- a/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -25,8 +25,8 @@
  </portal_type>
  <portal_type id="Payment Simulation Rule">
   <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
   <item>Composed Divergence Tester</item>
+  <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
  </portal_type>
  <portal_type id="Rule Tool">
diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
index 18cb762a15017993210d2f53fd2cd833d0f81870..afdbacd5b65fe7fa5c9ff10b0048487534d23352 100644
--- a/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
+++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
@@ -54,6 +54,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>InvoiceRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
index 2a2d960713be17d68b1f96fdcd1cadc4ff08f9cc..43e936d409e67a39d678c148b5b0db42e2036659 100644
--- a/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
+++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
@@ -54,6 +54,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>PaymentRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
index 652f1f4de480724cb34939bdbf087d6a2a4a2a44..d28bdfed3a7930fa771567a1d0c7f170a3486dec 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/AccountingTransaction_getRuleReference.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/AccountingTransaction_getRuleReference.xml
index 22f86100e74ba0d14f49379f2ab40b4175aabb0b..a8c833ff9d5f2a8f39b6501d6597e1ad595c07b3 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/AccountingTransaction_getRuleReference.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/AccountingTransaction_getRuleReference.xml
@@ -69,6 +69,37 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>AccountingTransaction_getRuleReference</string> </value>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.xml
index ea60031f21cd925514ebfd5badda3fa80d7fd260..62f9d1c9953e0faf2b04660871ae211bf48723f3 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.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_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml
index ff41bb526bbae3a36bcb49939b60638277ad7e56..841679237e2eb433bfad22a6e44a554ec897efaf 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
index cc900ec10f6ac0e2cd3df5567100088f0b1d172b..b1a5065ada4189a8fd2ac372bf136dbc2eff1008 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
index c522f0cd28fa839a2e1debcd4b3984ac8b2e486f..58d78e7ae2d7c31fce7acc5425abc588effa7523 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
index 871668cabd12178536c4e6be55f355771d950a5f..6acc340a912e0b2c34ecfdf95eb74b277f694bad 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
-        <tuple/>
-      </tuple>
+      <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
index 337a9714871c717e71bf19b4c0c40e11077dd110..6fa1f8ef88aaf5fb246baa0798b9be5740d11c95 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinkField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinkField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -306,10 +303,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -322,10 +316,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
index a098cdc230499dfccd261b86d48e358c3ee2beba..174bc696a71975729a495019804b9fd1b55c777a 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
index 05cf6d024489e0c496f16b7631d5c915d078b728..bd3f8eb813985fc04771a1658a66658a81b1d03d 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
index 8069982970c584db7142eddba825993ad33ecb93..d81f41e5e830d5124ee3261161fae8535e517827 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
index ea9766839b32f6e2fc739f05799b9ada9046d099..99d49d8b37ecfc29bca661260fcbf660a39e93a3 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
index ea78bd553cd5182f4a64e6771a37a42a4cfb6d4c..0397f4f20ccd66e9fa70fa5169dd8315e347ff82 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
index 13dea4f39d85db7c8f39a60328f2f3fd9ed6cc47..a816e6c61e92700aed487c0a7f283abb36c49886 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
index 7304e4965a88e3640807ccd83039df5e946987a3..31cb1a66beefa2964dc67d3bcf48779df4b310b8 100644
--- a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/revision b/bt5/erp5_accounting_simulation_legacy/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_accounting_simulation_legacy/bt/revision
+++ b/bt5/erp5_accounting_simulation_legacy/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
index f0175135028a7113aef349f643f5e8f637c06aa6..83b6f5dd3f8e2e07f42207b0d97141d7bb0e6e8a 100644
--- a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
@@ -15,8 +15,8 @@ Payment Rule | Composed Divergence Tester
 Payment Rule | Property Divergence Tester
 Payment Rule | Quantity Divergence Tester
 Payment Simulation Rule | Category Divergence Tester
-Payment Simulation Rule | Property Divergence Tester
 Payment Simulation Rule | Composed Divergence Tester
+Payment Simulation Rule | Property Divergence Tester
 Payment Simulation Rule | Quantity Divergence Tester
 Rule Tool | Invoice Rule
 Rule Tool | Payment Rule
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
index b237b4e70af55d8e59ed943ba1a2d5977f17183f..a3a2c32a4c5307c038523988e3b16fd33770246d 100644
--- a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
index 926cecca9470fe6ef9b1ebd20cd18f02537c9f72..3be34251c8000e87d1a8326b6aa93f1f2e1a66af 100644
--- a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
index 2b7a0e0ab4ad3d0ad3025289211e3e16cb872d7a..4a1696462384f2d96af390f8177f2fc72679b3d3 100644
--- a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
index 2b7a0e0ab4ad3d0ad3025289211e3e16cb872d7a..4a1696462384f2d96af390f8177f2fc72679b3d3 100644
--- a/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
index 23f9521e95751d568bfa9bc7d842f3873c9960ad..b5db78283818681d59d53f553711bb50a66fbab9 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -129,7 +126,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -137,7 +134,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
index 23c0f353e54cc4dcf07b5754ca574af14991d103..db432e7f7e54df2922915d51ec3953d4bdb563e4 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
index bc2ad009218d37fec25618fed0522ee1f723ccd5..63409d6e5b5cb480ee1548bf347d8d731c4a8248 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
index bab4bdb826b60cdefa894adfbe125733c154bc97..98e40df9159ae882535a8d7f51a4832e76ccecff 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
index f81ff420071db188b6ef17937fee871588803f0f..de23bfd9d524c35a52b2efd18540c18e5952dd45 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
index 6056a7df3f279ed7ba9b56a3ed8b9e74bb0a90bb..c1684bc15b35f985c213091e77a4af99e016b5b2 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MirrorMovementGroup" module="Products.ERP5Type.Document.MirrorMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="MirrorMovementGroup" module="Products.ERP5Type.Document.MirrorMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
index 67e75a5e29f5ee240e45cce37f6304fd9a6cf260..576cae9555adaa5f852a9894b6abd0c68a3dd6cc 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -174,7 +171,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -182,7 +179,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
index 667e49edb0aabedb85409f6d2781afdf03c043f6..bf7b2d923773a7689cbd9a1b140d9c3127d4df96 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
index b117eee73426d2caa01e145d23de45eeedc7afeb..9ed507fddd5a1907dbc63aaf8505e9d8740d0210 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
index 2e46b8dab532e6583ea24fe76cb72d0846e9002f..2eab28cb84f4d359d4296aaf6b0ac2e5d65b3716 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
index f81ff420071db188b6ef17937fee871588803f0f..de23bfd9d524c35a52b2efd18540c18e5952dd45 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
index 0b3b5388980e41ec6ee0974b30243e96b18263e3..d1728aec83f778d894f04349b4b550407d575112 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
index 8e721b5865a45c9735e364170f328b128891277f..7dbbc93d8d5c173f6e55632c5a7051064f01d2e7 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
index ac428333e28feb67f398a3a4e6ad8875fa96517f..4998940af496d88c0f11e637f6ea53bf6dedf5b4 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -167,7 +164,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -175,7 +172,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
index bc33df4c5abce78744fd5c4fb5d3e086cb7922de..cca05d16172982cef03e0859b68122558864abdb 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
index 108eb6c4db0cc125bf26276b8e8e2d386b9ad3fc..7ba5801ac1d2d83897bd3bea9d566b735a33d248 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
index 637e0134de01db6cd4f35211f2af6c4fc8dc2301..ca8fe3f24a975b076231ad59f3372846da7a5a40 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
index 9bc70513c9a5325132aa099b09e30b20fd529667..92785ac7c7e9daa846cbc744b9250b6ee968bd77 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
index 6fadf4e6562ea15055c95ea533dbb739a12917e2..2315e279e7f9a896db867ba7d7e1b6f4d43784d1 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
index aef622f6971efc6e296267a077877160d601f96e..1cb578e7b41f3710a3f9694a3a4b071bcd1ab28a 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -165,7 +162,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -173,7 +170,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
index 667e49edb0aabedb85409f6d2781afdf03c043f6..bf7b2d923773a7689cbd9a1b140d9c3127d4df96 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
index b117eee73426d2caa01e145d23de45eeedc7afeb..9ed507fddd5a1907dbc63aaf8505e9d8740d0210 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
index 2e46b8dab532e6583ea24fe76cb72d0846e9002f..2eab28cb84f4d359d4296aaf6b0ac2e5d65b3716 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
index 0b3b5388980e41ec6ee0974b30243e96b18263e3..d1728aec83f778d894f04349b4b550407d575112 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
index 2923b27d9f69d51ac39a51ba0941691bbd5ddbb8..f37d95b29d0a3dde9b466029d01cb714d97e6ef1 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -174,7 +171,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -182,7 +179,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
index 667e49edb0aabedb85409f6d2781afdf03c043f6..bf7b2d923773a7689cbd9a1b140d9c3127d4df96 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
index b117eee73426d2caa01e145d23de45eeedc7afeb..9ed507fddd5a1907dbc63aaf8505e9d8740d0210 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
index 2e46b8dab532e6583ea24fe76cb72d0846e9002f..2eab28cb84f4d359d4296aaf6b0ac2e5d65b3716 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
index f81ff420071db188b6ef17937fee871588803f0f..de23bfd9d524c35a52b2efd18540c18e5952dd45 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
index 0b3b5388980e41ec6ee0974b30243e96b18263e3..d1728aec83f778d894f04349b4b550407d575112 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
index 194f3505fe0bc00cdb89a5606e1ac48d3552bf1d..b09cdf30275cd79cec7e76d724381aafc064a4b2 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -167,7 +164,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -175,7 +172,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
index bc33df4c5abce78744fd5c4fb5d3e086cb7922de..cca05d16172982cef03e0859b68122558864abdb 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
index 108eb6c4db0cc125bf26276b8e8e2d386b9ad3fc..7ba5801ac1d2d83897bd3bea9d566b735a33d248 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
index 637e0134de01db6cd4f35211f2af6c4fc8dc2301..ca8fe3f24a975b076231ad59f3372846da7a5a40 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
index 9bc70513c9a5325132aa099b09e30b20fd529667..92785ac7c7e9daa846cbc744b9250b6ee968bd77 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
index 6fadf4e6562ea15055c95ea533dbb739a12917e2..2315e279e7f9a896db867ba7d7e1b6f4d43784d1 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
index 63dbdb100e20ae0e31b4961d9eea365d20a28dfd..2e094f5c6dab426d4543258abaedb2d8f9f89f5f 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -165,7 +162,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -173,7 +170,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
index 667e49edb0aabedb85409f6d2781afdf03c043f6..bf7b2d923773a7689cbd9a1b140d9c3127d4df96 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
index b117eee73426d2caa01e145d23de45eeedc7afeb..9ed507fddd5a1907dbc63aaf8505e9d8740d0210 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
index 2e46b8dab532e6583ea24fe76cb72d0846e9002f..2eab28cb84f4d359d4296aaf6b0ac2e5d65b3716 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
index 0b3b5388980e41ec6ee0974b30243e96b18263e3..d1728aec83f778d894f04349b4b550407d575112 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
index ca81d4c0df73edb12a57934bb6229a35e626cb97..d99c6f4fdeaffa2f959b259257403cec019ffe49 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InvoiceSimulationRule" module="Products.ERP5Type.Document.InvoiceSimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="InvoiceSimulationRule" module="Products.ERP5Type.Document.InvoiceSimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -165,7 +162,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -173,7 +170,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
index 2f8e133c400df06057468663041c1e39e5ce9cf9..e646bbc9f06c836bcdcc43b15ebb36cc6f11c955 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -92,7 +89,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -100,7 +97,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
index cfa35068bf575e78c6e24ef0b0dfb98e68c2166f..db62de0a7e420e923c73ebfc6a333850ae094d15 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,7 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -107,7 +104,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
index fc509725a81014657120916e0e9737d5579479a2..b1a3cd956e323f6100bc038ffc97a3376e2c5dcf 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
index 88eb334f1ec8eb6ae7b039fe893715e188997fff..9755fd87a8aeb52b77a606d8b5b773614f9d4169 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InvoiceTransactionRule" module="Products.ERP5Type.Document.InvoiceTransactionRule"/>
-        <tuple/>
-      </tuple>
+      <global name="InvoiceTransactionRule" module="Products.ERP5Type.Document.InvoiceTransactionRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -150,7 +147,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -158,7 +155,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
index 72a16a6df5295a5a8d25530d46dc0f4cff02190a..3892ef50a56d796279530ba47bbeab61bee966c2 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InvoiceTransactionSimulationRule" module="Products.ERP5Type.Document.InvoiceTransactionSimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="InvoiceTransactionSimulationRule" module="Products.ERP5Type.Document.InvoiceTransactionSimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -150,7 +147,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -158,7 +155,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
index f6513cb515c5e38d28f31c32f5c4d1c33b172bec..707dd6f0bb83a2d21dea95249e9659cfee2f97fe 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InvoicingRule" module="Products.ERP5Type.Document.InvoicingRule"/>
-        <tuple/>
-      </tuple>
+      <global name="InvoicingRule" module="Products.ERP5Type.Document.InvoicingRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -165,7 +162,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -173,7 +170,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
index 2f8e133c400df06057468663041c1e39e5ce9cf9..e646bbc9f06c836bcdcc43b15ebb36cc6f11c955 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -92,7 +89,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -100,7 +97,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
index cfa35068bf575e78c6e24ef0b0dfb98e68c2166f..db62de0a7e420e923c73ebfc6a333850ae094d15 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,7 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -107,7 +104,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
index fc509725a81014657120916e0e9737d5579479a2..b1a3cd956e323f6100bc038ffc97a3376e2c5dcf 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
index e34949f761e3151d7f830a01276bdc2189d73ca4..cef2329a14654fe9f6b4e4049e9c318bcac94f97 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TradeModelRule" module="Products.ERP5Type.Document.TradeModelRule"/>
-        <tuple/>
-      </tuple>
+      <global name="TradeModelRule" module="Products.ERP5Type.Document.TradeModelRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -173,7 +170,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -181,7 +178,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
index b9e5a42bb9532d989b47d814d2c597d213941adc..c5b9c85d91dad55ce6b449433ab88ff178d4682f 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
index de298c73acab38e722213308baafcb754c9ba9f0..aa13a71516623069f0d5243e68dd78e23365e19c 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
index e8d3126c84c2a2f350abede1c69e0792c5834162..76838782adc08ab0cb1fae0acf3d18db8e0c2833 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
index 5d9d54c8b8dd9c74e8903daf5a27819164410e7d..777f3e4a5ef82b7ff343fa61f9fc3507768c2759 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TradeModelSimulationRule" module="Products.ERP5Type.Document.TradeModelSimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="TradeModelSimulationRule" module="Products.ERP5Type.Document.TradeModelSimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -173,7 +170,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -181,7 +178,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
index b9e5a42bb9532d989b47d814d2c597d213941adc..c5b9c85d91dad55ce6b449433ab88ff178d4682f 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
index de298c73acab38e722213308baafcb754c9ba9f0..aa13a71516623069f0d5243e68dd78e23365e19c 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
index e8d3126c84c2a2f350abede1c69e0792c5834162..76838782adc08ab0cb1fae0acf3d18db8e0c2833 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index dd0ffe56196e9b9bd45a2698194c0304f83f3993..81bc77265a531e3dec6815d5d1d8c8d7c73dbe2c 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -15,8 +15,8 @@
  </portal_type>
  <portal_type id="Invoice Transaction Simulation Rule">
   <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
   <item>Composed Divergence Tester</item>
+  <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
  </portal_type>
  <portal_type id="Invoicing Rule">
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
index 1c29816092812c3350d729002c61d7df9f8c507f..2334f93a68325c99d145ca9607b0a2442c4e152e 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -61,6 +58,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>InvoiceTransactionRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
index 79964f95a8a4249ac605a6fd8578c755f1ceb02a..1adc84fd5b240af6c2eb7900a19f7aaf1d4ab4fa 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>InvoicingRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
index 2931cf456c7d89a04f4a7c47c4d8303e45f2abe8..15a784a1573ea5f30674f1c78c1e8b8dbcc7cc14 100644
--- a/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,15 +73,16 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>TradeModelRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -101,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
index efdde6a35dc585503dbb5af1f191f8b5ff71236d..719122a4b2df363ffb2d4117ac5da22c71be1aaf 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.xml
index 92931364a2fa444f5e3b14246f5a4eff2b95c682..d193eb6b933582a3d69c8911406b6b950c2f3078 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.xml
index e1975e73737154a1ec8ab92a4cf64defdb2ac6f5..ae93eed93f36d57ea8da9f519ede908e6efc183e 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.xml
index 44cb7a548cc9bcc6acf6cf553840cb62699baf89..d94be08257c9a2cbe4b049a99a68361b7c161dbb 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.xml
index ed03d81a8866df5a1c49efc961ccd9f0c9af4238..3313f455811b76c96f44413aa19c6facf361cdae 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.xml
index a0e9e42ffc3b5a03383746c37c5975c616e15803..0a899846ddd56f8d25659f8d43bd1a9af7c7bda3 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.xml
index d00e96a4ed98fec32002c74e40ba6deb6019e930..fba3d55bdd841583fb47cb966c5c9b4bec7c668e 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml
index cf40612a6f04967c9c51c07166397d23491fea03..c2722e0efc419daf181bb5f412d4f42171b15ec6 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.xml
index 84516b5a1d1a4afcc3565b9f8e552806c573f5fe..19de04f307b8f3f381e63a38d3e55f43b02f93a8 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.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_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.xml
index c2513cc52ee0392c7d8666d42fa13c2172183ffb..dc8738533517f1ba52d7c89f4b7c3eb3dcd4e34f 100644
--- a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.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_invoicing_simulation_legacy/bt/revision b/bt5/erp5_invoicing_simulation_legacy/bt/revision
index d8263ee9860594d2806b0dfd1bfd17528b0ba2a4..e440e5c842586965a7fb77deda2eca68612b1f53 100644
--- a/bt5/erp5_invoicing_simulation_legacy/bt/revision
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/revision
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
index 179b6fd1fe79ff229f228121f81953fb6bd3a6b9..2318b025dd49e6d14b83f6e7ccc36687c14ee3cd 100644
--- a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
@@ -1,7 +1,7 @@
 Invoice Simulation Rule | Category Divergence Tester
+Invoice Simulation Rule | Composed Divergence Tester
 Invoice Simulation Rule | Property Divergence Tester
 Invoice Simulation Rule | Quantity Divergence Tester
-Invoice Simulation Rule | Composed Divergence Tester
 Invoice Transaction Rule | Accounting Rule Cell
 Invoice Transaction Rule | Category Divergence Tester
 Invoice Transaction Rule | Composed Divergence Tester
@@ -9,8 +9,8 @@ Invoice Transaction Rule | Predicate
 Invoice Transaction Rule | Property Divergence Tester
 Invoice Transaction Rule | Quantity Divergence Tester
 Invoice Transaction Simulation Rule | Category Divergence Tester
-Invoice Transaction Simulation Rule | Property Divergence Tester
 Invoice Transaction Simulation Rule | Composed Divergence Tester
+Invoice Transaction Simulation Rule | Property Divergence Tester
 Invoice Transaction Simulation Rule | Quantity Divergence Tester
 Invoicing Rule | Category Divergence Tester
 Invoicing Rule | Composed Divergence Tester
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
index bede87cedd71b22ae9e245e10724b0ce0e8e03aa..b58bf500d26d0fe3f2853ce4215b93badbd1ece3 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -170,7 +167,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -178,7 +175,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
index 7f6a11cc88da07ad71d916a3256bf7cbe1c8c313..d295379e393b9c8bd72d49fa6150dd6e4f2147ce 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
index fbd6696390d0424b9bc28a3bf90e6fe8478608d5..3ebbd5405a2a3cf1a3ed727eeb601f127de05218 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
index 829350da0ba6238450560cd01500ea63ab4f6f82..7dd21a7bf56f51f9c0a17263b1ef9b11b679be16 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
index f1eea530c4fec1653756a7988f9c0f89ed1867aa..3bfa5172e7503ed3ef2a44919fb71d237782ddbb 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
index 23383e8c5890072e3a7b350d10161f7c063fb11d..5dbccb4e63b8488fedf059ccd7f1cb7d253e4bb3 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
index 8440998f7ddb78c0724efbfbc0b520a4b1d18a34..f497dedb81182ba5bf7066ac02c3af4d006d1fd5 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -131,7 +128,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -139,7 +136,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
index 81bbf96a9734f8e55df19de4120cc468631e7fc2..9303d08e7a313c04cb157f527ce0622c46bfcbea 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
index 501f2e2f294d7a9c5f667bd3d43e7ecd930ab9af..ff12e3fe85980fee6280c0e80e5d9d816db368dd 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
index 6e97c4329feb0b00ce613f0cbb21caa45f5ffad2..d76e5a5b53a39db549304254863a407be45a3397 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
index dd83abc1e0afc873180621d18b7358bb2363fb55..c415b7fd291303c0c375df553300a8e27f611a73 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
index dec59cd62793f5ab65cc2636e7870a67f8fd38d2..4164eb325b188a238cc33c4114e497a1ae493a35 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
index 0aca0e7d0069da867d4ca1ab8f6ade126849db54..8d2b0b55772ee3ec7d62933dc1804bd884dfa056 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RequirementMovementGroup" module="Products.ERP5Type.Document.RequirementMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="RequirementMovementGroup" module="Products.ERP5Type.Document.RequirementMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
index 9036caf26e852bd33fcdd52e553fc220c477aba1..758fddf225a516831596a1a4da707374bddca0d3 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SplitMovementGroup" module="Products.ERP5Type.Document.SplitMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="SplitMovementGroup" module="Products.ERP5Type.Document.SplitMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
index f1eea530c4fec1653756a7988f9c0f89ed1867aa..3bfa5172e7503ed3ef2a44919fb71d237782ddbb 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
index 23383e8c5890072e3a7b350d10161f7c063fb11d..5dbccb4e63b8488fedf059ccd7f1cb7d253e4bb3 100644
--- a/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_project_simulation_legacy/bt/revision b/bt5/erp5_project_simulation_legacy/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_project_simulation_legacy/bt/revision
+++ b/bt5/erp5_project_simulation_legacy/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
index 4e3cfe9166b465782b169e70a22934c197dff7fe..9777ca63a0b9d1fc3ed74c9b0d9075e8ec69e47e 100644
--- a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Composed%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Composed%20Divergence%20Tester/view.xml
index 5056f557917687c313f9710480c2b2fc5d5a9751..05008ade2694b26ad9152dd58ee13ed70c1c5789 100644
--- a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Composed%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Composed%20Divergence%20Tester/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
index 4e3cfe9166b465782b169e70a22934c197dff7fe..9777ca63a0b9d1fc3ed74c9b0d9075e8ec69e47e 100644
--- a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
index 35509fa0a23173173c608d74ff580594bffb30b9..91aff912346687deb3f03ff9bc04a4a982c3db08 100644
--- a/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
index af6cc7c42834aee6ec3976a7af9effa232387435..29847499a610bbeb0d533373fe289930175dcb5e 100644
--- a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,6 +51,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CategoryDivergenceTester</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Composed%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Composed%20Divergence%20Tester.xml
index 08996df7c2d155726f44fe1bca531a78653b8dee..77f27ee3056016bad04cd1935e0c6b609a3de86e 100644
--- a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Composed%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Composed%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,10 +74,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -97,10 +91,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
index 5d17fa142f4d5b02e79e7380410707e368388939..5b6a428b20d725bde15c38443b2d5ed83fcb68e1 100644
--- a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,6 +51,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>PropertyDivergenceTester</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
index 36d81e6da41973a5128d147d5fb9fd9bc1734864..dbe4d80af4d8b118aab630a23bbf635fc61aca14 100644
--- a/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,6 +51,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>QuantityDivergenceTester</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
index 0c4f2b80268d28590eb6c6e235f5633d2c9006b2..df9eda02e8a51ea1c9bd7d74979498b6e106a8d1 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
index 8689ffd6d9ce5ec5f01332ba055694853df57b6b..d4d26e049f9751e68e75158d81701eaf87dca36a 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view.xml
index d0b450960f5558cb9790b6808be6edc000606d83..9750b4348331a94ef203d480e989b24ba93076ce 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox.xml
index 7cc11bd7c3e84c10664d950bdcfa73a55b085857..991e056ab2ad962e4def8e7d34f0a41be122ef0e 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -152,10 +149,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox_tested_property_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox_tested_property_list.xml
index 667217e63bad013a731776a7c48bce1f3cb1eb2f..a69a1cc1e2d0e873c1d07730eb08f063ab607b92 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox_tested_property_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/listbox_tested_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_description.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_description.xml
index 5efac171056dc62448921c9c106383cbad4da603..47e0fc01091b67234142dab3722becff0f3305c2 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_description.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_solver_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_solver_list.xml
index 55ae947c40c8c7bcfc12c01a01b71c1d20a7b00a..5a287977b80c7ea12650d5b05290a01c5f884d8b 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_solver_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_solver_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_tested_property_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_tested_property_list.xml
index 512db2ce67b547772504e1c8358e1e0b6165729b..1ab068ad53340fb97b0eb5bfaa9b2b5e597a29ef 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_tested_property_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_tested_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_title.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_title.xml
index 52c14350f11eafc248feaed14c0c5bf34b71600f..c5bf384370c085cebb88637ed62c64d175ce4f6c 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_title.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/ComposedDivergenceTester_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml
index ec1e2f3896c92ab194e96901037b0d897468ccf5..14425f649bc53127d330565509a7ece053341722 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml
index 5efac171056dc62448921c9c106383cbad4da603..47e0fc01091b67234142dab3722becff0f3305c2 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml
index 55ae947c40c8c7bcfc12c01a01b71c1d20a7b00a..5a287977b80c7ea12650d5b05290a01c5f884d8b 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml
index 512db2ce67b547772504e1c8358e1e0b6165729b..1ab068ad53340fb97b0eb5bfaa9b2b5e597a29ef 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml
index 52c14350f11eafc248feaed14c0c5bf34b71600f..c5bf384370c085cebb88637ed62c64d175ce4f6c 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml
index 2ce76cd07489ab02dc991050a759465a018dbdb7..5bca96879f397b57e2e66e5c5e74218ac53a4178 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
index 222cdc08c2b3b1d838a8b16ef3ac884372a390dd..8583d2436d5f82fc9349b8de2fdc371931f87445 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml
index c9deeaee0b9b3082c8d95dc6f2137096c78be97b..f0830df55d992d339ae28b3108c966797c36f7aa 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -110,10 +107,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
index e1d9c49736db4e2e1b5b548b825802b6e3c2109d..92337f5e71cc2c38131514db21d4b57a20ab0ac0 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -146,10 +143,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml
index 5efac171056dc62448921c9c106383cbad4da603..47e0fc01091b67234142dab3722becff0f3305c2 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml
index 55ae947c40c8c7bcfc12c01a01b71c1d20a7b00a..5a287977b80c7ea12650d5b05290a01c5f884d8b 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml
index 52c14350f11eafc248feaed14c0c5bf34b71600f..c5bf384370c085cebb88637ed62c64d175ce4f6c 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation_legacy/bt/revision b/bt5/erp5_simulation_legacy/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_simulation_legacy/bt/revision
+++ b/bt5/erp5_simulation_legacy/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
index 33c72cefcd5e86d31d6eb3c3a53479dcc3539d1c..22970d1b45e812fe76e5be48ba3a1c7776a6839d 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
index 26dff186cda14d248203cdbd1d012b197ec576c8..d05ec6143a004a704acad720c85195c422280fb8 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
index dece649d86f8a13163bbfeecc6235ded452e8fbf..36aecb02b126015a2c143e078dacebe21442486c 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
index b0d20e54d57f4167a852ff18f515ed27d0ec952a..aa809d6473e20698905d2af15646fa88afa786ca 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
index 2b7a0e0ab4ad3d0ad3025289211e3e16cb872d7a..4a1696462384f2d96af390f8177f2fc72679b3d3 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml
index 2b7a0e0ab4ad3d0ad3025289211e3e16cb872d7a..4a1696462384f2d96af390f8177f2fc72679b3d3 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
index a1356b9f15336b23cc64860c86880a261a121680..eb5d988e4be2b1bf04ade0596af870285da9f637 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
index a1356b9f15336b23cc64860c86880a261a121680..eb5d988e4be2b1bf04ade0596af870285da9f637 100644
--- a/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
index 05c46f1df9e9cb2b8cc9f0b1230219a1b6de3ae0..bdd57b74d7ef703a7e46093e9d2f265b4693361d 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -136,7 +133,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -144,7 +141,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
index 77e8a007511aaa932f9a1a21d327dd52e1339a91..5330e84c775cfae7d912ba3f08cf99c2bf166358 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
index 4e5ddf06a2b3adf2cfd0378051ca8aa2c3d01df3..f95d0c9f8ffa86c8a5c090bc11c79cf4692072f0 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
index a77106f4c674efac1e3f9ab13a5f17479a6d475f..d5bd9bfa6c41f01e20a9d2a211c167299be8a717 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
index dd83abc1e0afc873180621d18b7358bb2363fb55..c415b7fd291303c0c375df553300a8e27f611a73 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
index 8fb27e9d4d04aa5e77a42cc0b29e8d10e4f3b91b..94ef1dc68e3039c7d787c45d7fbf6c5a0a7fe948 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -136,7 +133,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -144,7 +141,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
index 77e8a007511aaa932f9a1a21d327dd52e1339a91..5330e84c775cfae7d912ba3f08cf99c2bf166358 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
index 4e5ddf06a2b3adf2cfd0378051ca8aa2c3d01df3..f95d0c9f8ffa86c8a5c090bc11c79cf4692072f0 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
index a77106f4c674efac1e3f9ab13a5f17479a6d475f..d5bd9bfa6c41f01e20a9d2a211c167299be8a717 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
index dd83abc1e0afc873180621d18b7358bb2363fb55..c415b7fd291303c0c375df553300a8e27f611a73 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
index 3b3883aa9fe342a8075f708cfef41e039db6c1df..bdfa0f43be8d830665bbb5fac2a636b6ebafc0dd 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
-        <tuple/>
-      </tuple>
+      <global name="SimulatedDeliveryBuilder" module="Products.ERP5Type.Document.SimulatedDeliveryBuilder"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -176,7 +173,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -184,7 +181,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..74bf645bc0d6cf8b1f9d469007d279a7b1b3201a 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
index 77e8a007511aaa932f9a1a21d327dd52e1339a91..5330e84c775cfae7d912ba3f08cf99c2bf166358 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
index 7eb8d40a3418bb2e89b18ed14cb2e7f3eb631f23..fc217b9b5333501e815076674bd91b96bc79653d 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
index 21bd347ba5a2e0fd99cf486b34af42eb80d51999..dbaf495d388dcf56525395d8dac0cf1bad7e378b 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
index a77106f4c674efac1e3f9ab13a5f17479a6d475f..d5bd9bfa6c41f01e20a9d2a211c167299be8a717 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="CausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.CausalityAssignmentMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
index dd83abc1e0afc873180621d18b7358bb2363fb55..c415b7fd291303c0c375df553300a8e27f611a73 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
index 6dea91d70c08448c5b571371c12a96a8655e839e..a2aeb4af549953ff8bba671f3ec6cfb010dcef29 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
index 60c8e585b235d5cddb76ea7bf33082cdb8470ca0..596b5fa44eb81f3f69a81d6e71520137d76515e8 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
index 5e3d139019f41c42317cf1508340ebe2d226c25c..cbfa594021dde966c81b2b93a337ee138e92ac68 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
-        <tuple/>
-      </tuple>
+      <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
index 147bea154522f16aa773b332cddfcd529c70319e..3faa14f5e75ac4a6f0105992a1cc09a8f23f3fb9 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryRootSimulationRule" module="Products.ERP5Type.Document.DeliveryRootSimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliveryRootSimulationRule" module="Products.ERP5Type.Document.DeliveryRootSimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -122,7 +119,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -130,7 +127,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
index b28b001799d0e603180173c20d03583807ed9ca7..44d3992a1f92970078907d1e3ff67d5915f4ab97 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
index 4b132baeb2693e2ea0690d1863275d50131467e6..2bb6aeb3ba0b5e5c8ba12f1b2eaf1128c5518dac 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -106,7 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
index fc509725a81014657120916e0e9737d5579479a2..b1a3cd956e323f6100bc038ffc97a3376e2c5dcf 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
index 5f927a21c896e5549748123ed0749427493b5d47..e081bfd986b9f4ba5d6858e227c21217e082ffae 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliveryRule" module="Products.ERP5Type.Document.DeliveryRule"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliveryRule" module="Products.ERP5Type.Document.DeliveryRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -121,7 +118,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -129,7 +126,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
index b28b001799d0e603180173c20d03583807ed9ca7..44d3992a1f92970078907d1e3ff67d5915f4ab97 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
index 4b132baeb2693e2ea0690d1863275d50131467e6..2bb6aeb3ba0b5e5c8ba12f1b2eaf1128c5518dac 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -106,7 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
index fc509725a81014657120916e0e9737d5579479a2..b1a3cd956e323f6100bc038ffc97a3376e2c5dcf 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
index a45568d819fe9971456c834329b609389ed5b1be..bdf4988c5446d798ed9919039c92fe4df863123b 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DeliverySimulationRule" module="Products.ERP5Type.Document.DeliverySimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="DeliverySimulationRule" module="Products.ERP5Type.Document.DeliverySimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -161,7 +158,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -169,7 +166,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
index 2f8e133c400df06057468663041c1e39e5ce9cf9..e646bbc9f06c836bcdcc43b15ebb36cc6f11c955 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -92,7 +89,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -100,7 +97,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
index cfa35068bf575e78c6e24ef0b0dfb98e68c2166f..db62de0a7e420e923c73ebfc6a333850ae094d15 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,7 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -107,7 +104,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
index fc509725a81014657120916e0e9737d5579479a2..b1a3cd956e323f6100bc038ffc97a3376e2c5dcf 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
index d24bb27a7b97aa3fe09ee696dda71459113fb40d..d04bb16e085e84b54127e1829d989cd5d08c79cd 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderRootSimulationRule" module="Products.ERP5Type.Document.OrderRootSimulationRule"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderRootSimulationRule" module="Products.ERP5Type.Document.OrderRootSimulationRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -143,7 +140,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -151,7 +148,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
index b28b001799d0e603180173c20d03583807ed9ca7..44d3992a1f92970078907d1e3ff67d5915f4ab97 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
index 4b132baeb2693e2ea0690d1863275d50131467e6..2bb6aeb3ba0b5e5c8ba12f1b2eaf1128c5518dac 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -106,7 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
index 35a323fb8cb28fa92738e252dbe7726d84aa7983..819965a23b88bbf086fb38def2c560df53db63a5 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
index 64f306a989a7742986dd6057297d3b65dbf5cd64..2535a0232254831276e67170e83ff5608ab7f7f6 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OrderRule" module="Products.ERP5Type.Document.OrderRule"/>
-        <tuple/>
-      </tuple>
+      <global name="OrderRule" module="Products.ERP5Type.Document.OrderRule"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -142,7 +139,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -150,7 +147,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
index b28b001799d0e603180173c20d03583807ed9ca7..44d3992a1f92970078907d1e3ff67d5915f4ab97 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
index 4b132baeb2693e2ea0690d1863275d50131467e6..2bb6aeb3ba0b5e5c8ba12f1b2eaf1128c5518dac 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -106,7 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
index 35a323fb8cb28fa92738e252dbe7726d84aa7983..819965a23b88bbf086fb38def2c560df53db63a5 100644
--- a/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
+      <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,7 +86,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -97,7 +94,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
index d1108c93a4a250e6fdc1292f219ef019ecac5bb8..c287fe339fec6cd2e081cb9d7a73735ed2a80519 100644
--- a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -83,10 +80,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -103,10 +97,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
index 122971c8cadff7639cce35f5791c386d47055ecc..992506d8a670a9f45f08a90aa5d71aad748e125e 100644
--- a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -79,10 +76,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,10 +93,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
index 19086ac460b00da9da4d82624d88ad537900c9c1..c47316bb7944b64271c0154d757e152d909f9f9b 100644
--- a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -57,6 +54,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>DeliveryRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
index 52a2f84ab05838782b12b198113c1140b889fa48..00442b61a31c8426db480db22794b893502547eb 100644
--- a/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -57,6 +54,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>OrderRule</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
index d0421793091d35b856372b7a18b72880999ac3cc..3a69a5134d48f7e0c24427a7b0167878944a4d57 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.xml
index 2dc8cdd2b728635d97fde17dca2bac333447b3a6..28af5f2d0ea0203d6abd4d4ae08930009e58976f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.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_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.xml
index 46a05508e09259955e91c911663764111d5e4d13..69e4d98943d0771c1cde1bdcdca5bd014740f107 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.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_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml
index 67aa133e2debf5bbe4883ea23c1b9b4092bb2dc1..06de3c0e64cea4d4ae7e3c564bdf418458ff5799 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml
index 84d6914122612e311c86771de8e47546d5347d90..b52ed6f9ae54109e3db64b5a1f0576ec0d10d1a2 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml
index f43f12ad53949bc883900d630d477055e5fbf5e3..407313748d0ca03952214efde4de0b94fea2ffd6 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml
index 952b3834ef932b470a171ed36d8bf2ebdf42aa08..736f276445cad5175b4898649133215cd592bf9e 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml
index 793e817529480569923ec7c9683bcb7c83dd6716..fb7ae27cf01f261e835df4820d379c0892d7dce1 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml
index 0484fbde8661c1c933df1301226a689ca2d07ea6..4078d5340fd683851abcbf758d09df5a2eaef176 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml
index b79977befaec2d0788fbe512878b366c02fe6ba4..b82f731d50449f819d400558277b1c15facdfe71 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml
index c74ff6a1c9979e11350451bd07ef0f92f08b6f1b..6b09c913779cf30dc1ee5e3b5d1dd8a94bf46bb7 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml
index c8eb5118cda39cebbaeb0374f484d762760ed0b5..4902bb5c4d8a7fdc297b779d176592354bbfbacc 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml
index cc150dc7662e892bb1e2b41eac6425934a151774..a8c09c41be59e9978eaae35dbb121ff4663787b5 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml
index 4b3377e4f291b828a3bc20f1d2ee0029b433a787..0bb8ef4f85efd6fda2a287a82f8f366d84fbae1d 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml
index 0b2be9cb64064138d10a789823884e3ef608de65..52bff3e19de037d2c65855e3e82bd986a786ecfe 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml
index 36dc453e6ad942d7853adc0b54182c78454fb602..3970c6cd124616f8ccba240ef9bb5811bd76d948 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml
index 7a243720bf9b38ccdc0f2b457371bab80f0737f2..b048f3cd97bf9a5360e123ab588dec8a691f112c 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
index 39ca6fda0138787cdfa80cb823911fcb21c19a3f..db33b32735236ef5ceff4a2a12a18aad744cfdf4 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
index c9266f82f5d3b6b56da25e065194ea7d8066d8f2..7ce87392f63f585eb882afa02989db51808e98d9 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
index 158994d294c2ef562063521b3a4ae9b389963343..a618da4da2282bf780d45722bac30e998f516b3f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
index 81f982485fb44a7ee78080919c7d2b90c8737e0c..69aa7e52bde5dc6faa3f811863729d571be8d4e1 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
index 8958249b2c413024055e6635b96186f252340950..bebdf0c90638f207332bf11a6384d654e40e6204 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
index 997fcde49d54b7a446f64d23a06498fd5b0c3f74..73b6ecc49aea661952c3afdaa84cf5b7f7c5cf9f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
index 2f9a711410387386d30a3a2c1d3885a08b162a89..70413d17736bc7503b8e6f872ca4dd4531055ae6 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
index e80e8ce6f973aa994771d8df9a0b95af25438f48..4aaea312858e1c421d892a7a6f97c7f428793c5f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
index fef76daaef8c8cb3d3944f9e8e436eb425fac1da..6ae4bb496cd7e073748200bd4ec4aee6e4f106f9 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml
index 0b2be9cb64064138d10a789823884e3ef608de65..52bff3e19de037d2c65855e3e82bd986a786ecfe 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
index 55246c3ac5361562ebd63e4fc22e785385a3d37d..5dec61f6037759ed302684a25ef325e099276dc5 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml
index 568c72cd53417c553eafa34e0639781921b071ce..75ebf0febb7e8dbc530d9f253b016f619397a722 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
index bdb521e2da65ad3b481a09e3d2d4e7582a6f2a1b..6d4c45f7d84191c9dd6d08e4fbcf07729ef3ab02 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
index 640fde3b754274613c3aef40ce8ea09ec27a548c..0b4f9b0ab8b835fad9dcdcea0e8e7c4057c39282 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
index deaf5d13f1a61a273e553cd8b505e4086257ae38..b98f68cbc542884baa09d0c21118ff120f949248 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml
index 57e35568a3a921fc464f6b64f5977a51f266dd2f..aced695d1834ee794cb4ec8c5f20e09e41ef81c3 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
index 34df3b81b1794139d01c5d54835ecdca713d742a..935ab0dcee0685d43840bffd422afe3d3cd1a3e5 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml
index f0665292e0893e5e233cf7beec7d1c5be86052a6..fc5bb499743175d6729550ec0b0ae4fc5f62fc62 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
index 3c0842e18a99088f402106c6afd24e5e2e937326..e0e60d5139d32f25566e105c3cb2966f0f2f9142 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml
index a0e5b7647f1d2452c6bd3dfc698d70973b3969ed..7a9cad918e06241b7b7b00f82b861de3e2757bec 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
index 2c357795590aa8ebe46c85b6ad5eacfd7eed919d..f143ab0372a8d7639bd726dc81d93b95a5931d3f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
index 1c17524b9a50ffcb7222bd32f70ce9855cefd9ee..97437b655ffdc69f4cd5c6c1b7f9a29caeb79452 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
index fc4c4ac39b23a71ddbbf91aa0a1e08179b3233d0..f692f155aec07bc242f80e42937d2d3ef2f2375a 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml
index de2df8935941d030852716f9665cc18314deb087..808121a15aab24846fee6d410fef041367fb6c44 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml
index 99becfc911a9e2a2a168913ad20e8d9dd0620011..cbc0849b6b94cd4809ecf4f6c955fda45f4b7173 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml
index f23b2388fa7dd29e8db41211335ed4807c4ff608..39fde25474d0d94b07139ee7221d581edcb5a7e4 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml
index 8567201390d1541bc57edaa9377d1bfaecf49a87..ede173029a87d77003cbad9a9f79b4edf1f86a3f 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml
index 14ac09ea51b506bda5c103c9d8b0a438950eb6dc..12e747d387ac3a2b4b7dcf0de5b2ef9a71641cd3 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml
index 1ab0b8e2ed5768d0879d0f6e00b66672549762a1..31915af67c5ceb8e087a0995084ce6c1f3e254c0 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml
index f43f12ad53949bc883900d630d477055e5fbf5e3..407313748d0ca03952214efde4de0b94fea2ffd6 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml
index b79977befaec2d0788fbe512878b366c02fe6ba4..b82f731d50449f819d400558277b1c15facdfe71 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml
index 4b3377e4f291b828a3bc20f1d2ee0029b433a787..0bb8ef4f85efd6fda2a287a82f8f366d84fbae1d 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml
index 0b2be9cb64064138d10a789823884e3ef608de65..52bff3e19de037d2c65855e3e82bd986a786ecfe 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.xml
index 8d3e208be8a4335b4dd98ef754258ba4681f85c1..0e2546bd7693bf1aabe79f7555038cab5bf80eb8 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.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_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml
index d9cd7e812f057701444c9453068c4dadf93e5bf7..94c80500662d05b21b104b5bc19c296ffd6861e0 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml
index d7ecf9349ad87b6cc5da32e89a10ba913b797fad..fcb945c37af3e80894be3226e545c85c2aee13d0 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
index 850b588bbacbb3efccd4d364ae08885f72b014f8..f7d2ec030b78ac1da51c9a47bd0afeb3da8471d9 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
index ac2756bf18ed3db95fd282aec10cba637060aeb2..225c87ceeb8e4c14bd3b909cd0c7dcd5246ec955 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
index 024a881953f57002db810f32fcbf5dbd0378a54c..9aee0be8a8f3c061a786f9f0f934e5bc7f9713fc 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
index 742a78af0e3749a7fe63b494ff474cbfdd0b8a00..ec125ba47cf2b850aa3c21db073fdf22572140de 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml
index ca2117dc97495980c638f789494c9be2936a27ac..dcbf555a262edb21f7a86f530455a4b3b91643e3 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.xml
index 059f4612f7441e36fb147444cba41b00b782c637..eacd63d4dac3dd94271d17c44e3eac0432c17f08 100644
--- a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.xml
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.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_trade_simulation_legacy/bt/revision b/bt5/erp5_trade_simulation_legacy/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_trade_simulation_legacy/bt/revision
+++ b/bt5/erp5_trade_simulation_legacy/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file