diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item.xml
index e4d3ef73ee7859ac887dd9e412a2e4f48336a28e..2d7254c5e965e5e9a92e18768189d716ecdf01b4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item.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_item/SkinTemplateItem/portal_skins/erp5_item/Brain_getItemExplanationUrl.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Brain_getItemExplanationUrl.xml
index 944f196d20853779835d7ed246ef708bc58e0828..81b9be50ed7a6debaa13a3e80d35df52efea0e69 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Brain_getItemExplanationUrl.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Brain_getItemExplanationUrl.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml
index ce3c677ab826f1313c011d7ed83248a01aa3d917..80bae017a36edaceaf8df3e6b1ec057a08e698e7 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
index 3b7beb64a62c238e14db0d3b07a740f4d681e88d..2416339bbe727f9df0aec0a3d648468d190a7f40 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getItemCreationDialogListboxColumnList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getItemCreationDialogListboxColumnList.xml
index 8466af77a62439e294218e219968578db4242c48..324975e02f607896834d98b0f6ef8270bae58111 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getItemCreationDialogListboxColumnList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getItemCreationDialogListboxColumnList.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml
index 64eefcb46844131a988a20212386290c3cf931fc..d7477032db90aaca03553f27fb9b9cc342a341a4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml
index ff46a072f2ab9305d1626e0f70cd65067baf9d00..96640c76852aa9bf9181a051050ca851bd2d69dc 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml
index d6d6544df9b4ce1f70b913ca3dd99ddf33fddae8..8f16a0ab87c1c1a6b7322b2c7f626cbcf2ad4ff4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml
index e8c39cfe5df2ea3a6d67a6e63d7feb3a4ceb073f..5f5feed95373f93859364e17f79d2bb799623e98 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml
index c25847760633dfb82c2573351fe81ad81c7cab13..d6ea1eaba3b2dee54817644f98d78657e78fc94c 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogEditableField.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogEditableField.xml
index 45048353fea013a55116751a593d8f5628678ade..55e47048146b60753e037bf1ae85a3b0e00a6bdd 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogEditableField.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogEditableField.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
index d6a76a655bf8b3fb0d57e15162ab545c8fa9fff7..a2bec36082136e3a8ecec3c49b3261c500fca730 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml
index 809d48a0c0facb8aca9e96ec400376846db03cdb..527862472d2669fef6d656c7a6ae6bc96b26175a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
index 2210b680d99ddad1bb2c5b9a53a0dfe2339c71b3..697b348c6ea27bcd21fd3b5ffb5940a4a515217b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -558,10 +555,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>
@@ -574,10 +568,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_column_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_column_variation_category_list.xml
index 0e6817fbfe1bdf1afc7acd1637c4d2febcc7c47f..064b14e0dc53a457e4752c08ea00f493ec6ad3d4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_column_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_column_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -270,10 +267,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>
@@ -290,10 +284,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 1
   </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>
@@ -306,10 +297,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 1
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_line_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_line_variation_category_list.xml
index 0c05896002ddc7aef7364b8eb707baff5f0a0a32..4da291d76c8b6fa84cd80b6d318a244d2a138b8d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_line_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_line_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -270,10 +267,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>
@@ -290,10 +284,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 0
   </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>
@@ -306,10 +297,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 0
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_quantity.xml
index 7b0d4aef85a132a5f0c23c9691c89f87709d36be..112e7dac8ad868def4a747749a8d3a35cc07253d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_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>
@@ -108,10 +105,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
index 185058f028df40ba21fe8f53e5f2b64b6f4835ee..0e696c2f1a7e1f89324ac7c1f4d67f0c9fa535e9 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/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>
@@ -150,10 +147,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>
@@ -166,10 +160,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_tab_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_tab_variation_category_list.xml
index f3976372c4115627789f168b702379c643b78c5f..15e72a2e13feb1cca45c7e5e779f56a53c35e461 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_tab_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_tab_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -270,10 +267,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>
@@ -290,10 +284,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 2
   </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>
@@ -306,10 +297,7 @@ python: len(context.getCellRange(base_id=\'movement\')) > 2
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_title.xml
index 81f035e424bf56c5fe5dab5e1642f5e740aa2667..ede6708fd1cfba3c80c8a18e8a9c0764ca7c0138 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox.xml
index 05650e12616e1f07401423476d81837e07665ad9..e71cc7626a5fbe12c417114cde588e895022c13b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/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>
@@ -295,10 +292,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>
@@ -315,10 +309,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </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>
@@ -331,10 +322,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -347,10 +335,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -363,10 +348,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox_quantity.xml
index 8ad00826d8fb58a2e60dae8df14610bceb7ea172..3799dde4f6de141f4827936fb5095a4db77815de 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_destination_section_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_destination_section_title.xml
index ff5150654fde8111884a622c9c09a64c20a07e5f..8f878aa5d080c259dbd0a05c7ead76305c29ee0d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_destination_section_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml
index eb8c2bfcb7505974891f098518c82ad3232b76ae..7b98a958f8ee2df3fe67827d8c3e8915ded14664 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_resource_title.xml
index 59c9ddd427d4d50d4fd81f595c5a95804abcb4b7..a0774777040459dd5b020a61552b275b6872a10e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_simulation_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_simulation_quantity.xml
index a6ad28259007bea7e1d823acd71fc2830f5da78b..da8e455777f2244e29cb982856ce4ce180005f2c 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_simulation_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_simulation_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>
@@ -123,10 +120,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_source_section_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_source_section_title.xml
index 9075e9fd8cd86d88f01266623f4c9d3805e2d41c..5bfc0957ba69bb3eaf2bcba68b678f5b48ec87cd 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_source_section_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_total_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_total_quantity.xml
index ada409b2daeb0e653c23f37dc1e51c6ed0dc8c86..9469b48be92e7c01b8d593a3fe54a4e1459b654a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_total_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_total_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>
@@ -113,10 +110,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
index bee51fad5442b41f6831a818dcc7a49efa1f66dc..90dd64e801bbb2918a369e6755b037dc257cb4ab 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_extra_property_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_extra_property_list.xml
index 995fb02d66d67cb75ec8b1acf3d484ccce526988..ee589ee2304eba4b1fe5f11bb645224297686cd5 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_extra_property_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_extra_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FormBox" module="Products.ERP5Form.FormBox"/>
-        <tuple/>
-      </tuple>
+      <global name="FormBox" module="Products.ERP5Form.FormBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -178,10 +175,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>
@@ -194,10 +188,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_type.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_type.xml
index a38ff73897416dc06c3d135c9d441c0da47e3338..dba8df9ef69ff03437fcb8425be85416eea4d50d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_type.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -266,10 +263,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog.xml
index 5d1d2049b3794aae3674fa3b2cd79a9d56201201..fd49d73e30444e01f0b729981b1217e804905dde 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml
index 834a8eb49432ae95e4bbe0719c1ae05fab09a26b..885bf243341c40d656283f2e7f77c994c124c01f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/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>
@@ -210,10 +207,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity.xml
index 2f1b754557a57e78eaf9ca768e4001709a60f8e9..8b5123a1c2fcc6dcbe02ba65eb9e5eb2db5742f1 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity_unit.xml
index efd6dda87a53face23c1d6c753ac47320cd40d62..907622d857ea7fb1df9edcd87a45e49fe9875649 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_quantity_unit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -266,10 +263,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
index 38d4b94d8b52f065e05e0a645cf04b77de200be0..9cf186e486f28c32704cb29d916c24fc0d361eae 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_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>
@@ -262,10 +259,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>
@@ -278,10 +272,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox.xml
index 05650e12616e1f07401423476d81837e07665ad9..e71cc7626a5fbe12c417114cde588e895022c13b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/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>
@@ -295,10 +292,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>
@@ -315,10 +309,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </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>
@@ -331,10 +322,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -347,10 +335,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -363,10 +348,7 @@ python: [x.id for x in here.allowedContentTypes() if x.id.find(\'Cell\')>=0][0]
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox_quantity.xml
index 8ad00826d8fb58a2e60dae8df14610bceb7ea172..3799dde4f6de141f4827936fb5095a4db77815de 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_quantity_unit.xml
index eb8c2bfcb7505974891f098518c82ad3232b76ae..7b98a958f8ee2df3fe67827d8c3e8915ded14664 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_quantity_unit.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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_resource_title.xml
index 59c9ddd427d4d50d4fd81f595c5a95804abcb4b7..a0774777040459dd5b020a61552b275b6872a10e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml
index a6ad28259007bea7e1d823acd71fc2830f5da78b..da8e455777f2244e29cb982856ce4ce180005f2c 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_simulation_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>
@@ -123,10 +120,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml
index ada409b2daeb0e653c23f37dc1e51c6ed0dc8c86..9469b48be92e7c01b8d593a3fe54a4e1459b654a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/my_total_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>
@@ -113,10 +110,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_portal_type.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_portal_type.xml
index a3500a9d4770c17f63ad4d353b6c44808436db39..8850e58b32aa208f7e60df31bc3cbb9728105f36 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_portal_type.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -266,10 +263,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_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_reference.xml
index ca98b8e9209752cc52c448aed3310cf010e16c33..35a0af10dfb46b91e112d69d56146c3587d5f022 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_title.xml
index fb476c404157eecfc8d54859044cbc3978e870fb..3c1561ef79d076112bbcfb551a46e2ba057969c2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/your_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml
index debb2714f2625a8a91e1f39be62bbd34bd52524d..c4fb712853ca296414c0fb4d5a60ecadfb666070 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.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_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml
index ac1640a1b6c2b7d81ab426133376f6969c0a54b3..940786781d1079277301f95968b624f5927783ea 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml
index 4cbdb4674ebe4beaaaca73b3d3ddf4efba2ed956..085434c9952127b52e16e5c4c6ecd2755881e083 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -562,10 +559,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>
@@ -578,10 +572,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>
@@ -598,10 +589,7 @@ string:Base_viewListMode?proxy_form_id=${form/getId}&proxy_field_id=${field/getI
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml
index bb5437b10003e54631bd7eda54c233a57f7bc550..a23604e5eb44927c9c90bf7f88bf26860dc5aeec 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_quantity.xml
index 1252a2ccb8a7b2c434c741f88b7a0b23184a39f6..2b8124577742dc1f2eb76e5edb0f5ddcd73e8cb4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_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_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml
index 2e3c9be9dc6773103967ca4d942023cecdb70ba0..861bf6a0f613356c2c8ac968d95e109bfa114d9b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinesField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinesField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -302,10 +299,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_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/my_title.xml
index 72086b1960d2beeb1ddcab6dd138ffa3637a8464..e66fddb2cf9eae495837f19a8ec26e522c2a4ae7 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml
index 5ad97405b229564b096a87c369659a61aa5e5988..8571fe84b17d6362d8734ec1d9a68b1cc126c991 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog.xml
index 758f8d07d15b293bc156d9abf3519a525b15867e..aa37eba3f5d5cac6d875dc404f9fba0f26395716 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog.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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_portal_type.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_portal_type.xml
index c2f1ec102ac6a413131dc49395b48487787a402c..c2997a82a373daaff454a2521653f8070c375650 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_portal_type.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -266,10 +263,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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_title.xml
index 0119f8da90bcfb4930e1fa7dd9ca5257c11e4e63..c6408b377ff1483d153e062ed515fca8f55a88be 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewDeliveryLineCreationDialog/your_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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList.xml
index b13f5c1cb0964d996fbc0673d27f6b0f5b357767..5bc76fc0b570d6e06f7ff28391151620ccace5a1 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml
index 49c02934b987f7ad2fb762c24cdcb0826325e221..797a4770190c062a34121b87101d750488168436 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml
index 9d38523047132856e9b9d31d21ad1fe61b161ad5..a98749c8bf52f0fc0d48b8da29d99ab31eba1a2b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml
index 7a887aba5ee04140c00b0cbe83b9fe555274ff1a..9f1c64b70cdf9fdb0870722fbbdae1052090322e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
index 06a72311d19dccb25e764eceab706aef5216b4bb..52dace5c2f39575da13eb469b0f035e8dd27c6fd 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml
index 68c974a9915f1b510f5fba5006d2a04ed55172c4..f888f7a14a15df4db948c4190965f393699a2de8 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml
index c7edb60d46e6c4945f483e2df392950715d7aecf..f40467ef98da68b9f2e4db23ee91392e42a4bc5d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteTitle.xml
index 7b292623b378d84fc59d899a800ee1fc56f0dbfb..16f8b63216ab091c9e5bea35db265f04432c7ce8 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteTitle.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteTitle.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
index 24c2389bce8953bbbc0644025dc2cb70832092ef..0f61cd07aa2083738825dc5e0b2bd0ae397794de 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getDeliveryPortalTypeItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getDeliveryPortalTypeItemList.xml
index aa0bc037197ac222fc7d25c052d42ea6cd37d485..d723a7029ee20cb9383e81ff2b2cbc08de74795c 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getDeliveryPortalTypeItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getDeliveryPortalTypeItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml
index 13b0bab881ab5125a679421b12b65c7dfb393005..3d88343e9475ef30509b3be733c2d66a8af0553f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
index 89423e9fc941dd9e1d6ec5d832a0d167391888ba..22f7b99f387122c15cc217a30ea6cf1d7ac2535e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
index a688f8958f19da9cb59dc3ab1f9e1f16fc9284ff..a8794c88556e8168e357428ba511a4ae8a1b8c2b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingFormUrl.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingFormUrl.xml
index 36d4a228781705fcd051e8f667b5fb10bf137906..f2794edbd388f22f49a818a7349fc4d45139df88 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingFormUrl.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingFormUrl.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
index 506a730f062dace1f1ae8b3a695f1e999f93dc95..7318e8a38fe407e2f04b2b51254fc0e7d07b5114 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getUnfilteredTrackingList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getUnfilteredTrackingList.xml
index 039e2873b757a9a78d4ded817add005f4f0b0ccd..8845083aeed1875e3775fadc2d14f6b45d7b3da3 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getUnfilteredTrackingList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getUnfilteredTrackingList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
index 349ebe0cbcd6ad2103dbe07b52aee5bbe8b88ab1..84041d36a7caf0d59045212cafeac39c4c7a920e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
index 5b3b167a2039080ac0e623448329b076bb2fefb5..62edc1df2a532e32b279f36a5271aa9f3d08367d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
index c8ea8bcabbeb9f1f4db6c8598dd5d0ec294b300a..aeec7831ec739a47ab25a531c3a783654e3edc74 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm.xml
index 6d7f0ad526bc9333f1fecbc72c8dac1915ef55c0..0d0a0d14e3fea65b1a540da3b09b760379b20b27 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm/listbox.xml
index 8143cd226412aa6056ab4611e2de95eeded3bcbc..b67ea7026dbf572cde70d8e2a743afc34c1b03c2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_jumpToDeliveryForm/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -573,10 +570,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
index 05313e30400aaa58ab853142b2ada38c8a622d00..77ffc3200d50529882049ae8702cfcf9ac529fd8 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml
index 86e95c82c03f2a7e3a694f21c559074861c7ed72..438c4bb78bc6cbd951d36b2d6f2d91ec625ff844 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_owner.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_owner.xml
index 551fc6248723e09cabcc189f2a293b03655830d6..cc73df3cf87644f14902690b694a351713f4c186 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_owner.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_owner.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_site.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_site.xml
index 054c490a64003ad2fd9dca95f54b3fedbe9c8d99..cb17887e0cdb1b26e05f263e9a6721388a144566 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_site.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_current_site.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml
index f16a4e49738d0603d60781647533c33f3a9d2e09..afcb06a396b726b8357c34f7113e3cd9b99c09f1 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_origin.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_origin.xml
index 0d5c3899900e2a24ac765b44aab26be1d411c478..b39e59d38b4f01ebe4439802f77386317f446ce3 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_origin.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_origin.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>
@@ -119,10 +116,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml
index d6eb81a77d699a90468a5a144fe49d6f7d45c20e..192dce772a4aa1831c79afa53e98c68cd78d6dea 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml
index b04f4d4907be0369ff40d91e891bc03788e6195c..f8eca13d4faa1ff02bd79f8cad60621940f3669d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.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>
@@ -112,10 +109,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml
index 7ce498416c3e175c3bf7ee5839f5a5732b02a356..189f6f6654de7086b5d5c8bc42802b2221a6c720 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml
index 1e877fd3f9b0c371f3b2b7709b1ed56ac346261a..699f621d37541f25ddaad8bd307af347d3a2ec2e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_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>
@@ -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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml
index 59f3ed941ff014c18e5845ea42fc0b1499a06ed4..85e1643a989f40311e4f2fcdb05a52f7a062cbbe 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml
index 09b130ec8dc4c4de9f6b06bc8ba79e2b8f5b2ebe..38145b50e8a7424c4cdb506f157dc47f42de69ac 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
index 6484b2151827e7793e87411e46a6f9d23406b174..64eb2d7f3f8faad2d9bc3eabce965ed9ca72777f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
-        <tuple/>
-      </tuple>
+      <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -286,10 +283,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>
@@ -302,10 +296,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/your_item_extra_property_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/your_item_extra_property_list.xml
index 5665904832da633c3d9f8eb64540d812f96cf44c..958ff3934a3bc015c15bbff31c397151f611620a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/your_item_extra_property_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/your_item_extra_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FormBox" module="Products.ERP5Form.FormBox"/>
-        <tuple/>
-      </tuple>
+      <global name="FormBox" module="Products.ERP5Form.FormBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -178,10 +175,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>
@@ -194,10 +188,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog.xml
index 8f4500a51611cd4dabee1a78e8d22d38fa2c97d4..581e5763084b4eda77b7d5634044040229036b31 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity.xml
index e966ae9c8e57854574b5226cb76746e11672363b..773d523c1da14289763c7cd07e0ac3d730b408ff 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity_unit.xml
index bc306025d91dc79dd2f19c59a48dc204ca81427c..7b5b550dc140daaea97adab953b37af790be2449 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/my_quantity_unit.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_portal_type.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_portal_type.xml
index c2f1ec102ac6a413131dc49395b48487787a402c..c2997a82a373daaff454a2521653f8070c375650 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_portal_type.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -266,10 +263,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_title.xml
index 0119f8da90bcfb4930e1fa7dd9ca5257c11e4e63..c6408b377ff1483d153e062ed515fca8f55a88be 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewDeliveryLineCreationDialog/your_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml
index 83796a020df83eecd042dacf44a490b5682bfb67..7c1c26a338dc1de2b5e1e8846dfad5e09da3290b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_comment.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_comment.xml
index 48ce0eabb617438cac4aac85e7810a44bf1cb946..fa857d2924c68c4fce03d1d354dba71f65146484 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_comment.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml
index d39cf8aece236ae9d1ff68b7cb66489d13a66b82..5ae6d6f3c575417b2e45d60e68077cddcb329cfb 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.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>
@@ -120,10 +117,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml
index 1931b256d6b7ca8d7361f9cea9f7fa6a1474ce5e..d5306cb40e31be71f8e9e03a00fca083ba2740b2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.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>
@@ -128,10 +125,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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_description.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_description.xml
index 07dc3bb1714a5be8c06d788d75046d1ba1aecd43..e98bd2614bed171964af7f47a08b452bd9c82b49 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity.xml
index 66bcdb5a5a69190ce4fe82c499f263b8cab35628..7b31391d75fc21f47622120b010776cc8f8a532d 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity_unit.xml
index 7bc22904ccb95f9333509f2606d6b814846cb1dc..8962788b089f5337cc987702a3676482f6a6bbe2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_quantity_unit.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml
index 6c8c8d2d792c2e22a0f931c8ee25de1882585961..049c218f9595b7b6a5cf4cf00203b11876379f02 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml
index 20c4ae576297c4b5b8c3e37abef71809bbd13485..2493223c717877dcdcf066eb8a15cfbce9983c24 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_title.xml
index 5d1226a06fbf7b31bfc0c97a5cbb0a69ce5e7427..15227cc553c57d634703703dcb26ca5ec37d3257 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml
index 4dd024fd4c1b62b852275f73693b8193627688be..81eb963a2dfe3692c00aef21f593bc8e3f5ecca9 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_resource.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_resource.xml
index ef695aa71fa134754526357cf4caebb6d046724b..e51d160fc519b285c3fc6873ee255172647a5589 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_resource.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_resource.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -270,10 +267,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>
@@ -286,10 +280,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>
@@ -302,10 +293,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml
index ee03ec14727fb0cfacefe852634f6ffc39a56afc..30ccc8202026e7acce88b384e457947cf4fb0c88 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
index df2f4d2ae726ca2f9d7a8c59710bd252d0454910..b0a6567e6152408ed233f2d6eb26f88311a00b94 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
index 4750bdb2e571aa274747174a4540bc7bd019139b..0e0237c9daacd11dde0cd4412ef1a4815c1da425 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/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>
@@ -225,10 +222,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_date.xml
index bcc029bb634c2c19b7b30df7e304871fb09c1ace..8293e400aa64186ff8b53f727bcce47b332e50cf 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_date.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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml
index addd68aaedf9616f6d6f18cf152eb2629216b5c5..e2d72ca270dbd1736e5ec7c32791d4e00e63dd47 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FloatField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FloatField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_item_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_item_list.xml
index 936b86c080b11b67ff52ce335153c0461bfc6e78..64a1030ec8dc0296ef7663bd00c22627a671819e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_item_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_item_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinesField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinesField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_reference.xml
index 44e43c41d47d4bb2df9a1fa7ae3044cc1f50804e..7495b2c30aed4cbbf6f2e5dde2a0d1d76aeaec7e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_resource_title.xml
index 7da13ac8d80ef3b9d1637a2f6480103fead0243d..51d34190af6e81a6db4f6311b9d38149dcd7e47e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_resource_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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_title.xml
index 318d6ff5dd95816b2c8fff63e7af22f716799694..3c7673394590911cde600d39b15a4b86fdbc3afe 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/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_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList.xml
index 6e5cb22f60869199be9f2fcb4ddb5edca2c67241..1844ddc2db7bbef9e88cc213a821c220b0156df2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList.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_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList/listbox.xml
index 6b863d18ea3954ba1ec2c8f398b58963d5edf0fb..7051411ff988fe2d70204327b20320d2f6c9fb38 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReportModule_viewServiceReportList/listbox.xml
@@ -2,13 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view.xml
index ade0b995b9f644b87d8133c87955a4029a194ca7..fb73d4a617d79e7e69e585662dd6ea3d0410b262 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_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_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_description.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_description.xml
index ec91866be2fa840bed7c38bad6064ca5c0c57453..f1e18511e02201128692fb1789a6ab4f93a1978b 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_description.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_description.xml
@@ -2,13 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_resource_title.xml
index 9e787b763681916e65dcb4cebe107ab4ca9530a6..171d6ce1dd38ab3f2971fa7861c99c522a509b28 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_resource_title.xml
@@ -2,13 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_title.xml
index 50c6bdcec1bdc834e6da5ecee5376d6fa62d65f6..8a6983fbba99dcdd2599a6e3f04b8e02946acca6 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_title.xml
@@ -2,13 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_translated_validation_state_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_translated_validation_state_title.xml
index 56de445dfe94b7c5398fbf610476cc1ff38fdbfe..38145b50e8a7424c4cdb506f157dc47f42de69ac 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ServiceReport_view/my_translated_validation_state_title.xml
@@ -2,13 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow.xml
index f0829343326e27a8b13bdac8aa28edd36692cbd2..49c23d8074bb89799010c66a189f23e99205d710 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
-        <tuple/>
-      </tuple>
+      <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts.xml
index 0622b3c34fa5ffe83ab080066492f760b230dadf..072c8f6540c07806bee17a34c920ec09b2de1bd5 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.xml
index ab1278b56091e5ab251763265a84e60d3b4dbeea..9d113170b64ec04b11813165b7e1a8f9e6b548d0 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.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_item/WorkflowTemplateItem/portal_workflow/item_workflow/states.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states.xml
index a21bb6e95907daaaa25a050ce309600283726693..27ec9069024e0f59bf4b612113789f37da98879b 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="States" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="States" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/deleted.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/deleted.xml
index 1aeed1c6b4d01b37c5451bfbca5c523174be6eb8..439857330fa1bb8273c6437fd83fc3729dfb5eaf 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/deleted.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/deleted.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/draft.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/draft.xml
index a30f687156a8de8058a32591a933da0184ad0148..e6ac72680e4a4034d170bf5cbb84437dd940d017 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/draft.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/draft.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/invalidated.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/invalidated.xml
index 1c5ffeec8e911c14ae048236559d59d17c4803b8..13c4610c1d581a8e0cdfafff7d5256f205b5b819 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/invalidated.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/invalidated.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -49,10 +46,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/validated.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/validated.xml
index 15273d0d91a3da5bb586771a19f5e83d78f4cd8b..0d8c7facc792c2af22f9cd3a7b9f996942b6b905 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/validated.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/states/validated.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -47,10 +44,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
index 092a5b48f6f98be184d86f13a78513a159cfd129..aa36144efed916b804f5f80df9452b1e3166bdec 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete.xml
index daef3cd1be33c5b76769c68786a7e5622531f626..486dd708017f21f87edcf4cb5de81a8225abd09f 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete_action.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete_action.xml
index 1f98d620f8dc44ded05dcd27d8a5b0dbbbfe182f..32746e0484769202f7bc815762dc54cafbf35728 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/delete_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate.xml
index 8d61e87c6b1648d19d315f8776d45998f95f5fc0..3db1e1329c524d6ca90fef9f107de7bc8da26c9c 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate_action.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate_action.xml
index 29b843e72bb2856c06a86849fd25c3aff3593dc9..d1f2e128493f75a77c805b5b2b65749d8aeb478b 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/invalidate_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate.xml
index 817a2b64537d1fbc9711d23abd8c8ed68cf456a1..04ab1f7909a71ea4d5610288aa4a95779c87abee 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate_action.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate_action.xml
index f38c70ef07241b9049318cc0b60c6e366f4eec75..5d62ee2387a18ab06c2e30832531540f85070558 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions/validate_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables.xml
index a067e6fbbe0c9a5db3778dc414d3acdd4ead9200..bb12bef805f190ec50e023368d6ee5c6c990b816 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/action.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/action.xml
index df6c2ee67f067594e6072419196a0fcd0af53fc4..7e373627980318315c844dfbb3d6507d12eca323 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/action.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml
index f65890149e3c97bd77e576417ab0c248f0ae2acd..41b5adfb2b73fd9f97264ee902f2831d20b4910c 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/comment.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/comment.xml
index 5774567823edc45b61bc1885db40837449366a6e..e22869e0c27d2b9ff5fbec5a5ee0c4eb20d6a99f 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/comment.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/comment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/error_message.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/error_message.xml
index ca8bd983f68e6bf79753e524e850ac0ef7478ef3..535863de2a26221cff2a356674852ea83bcee061 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/error_message.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/error_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/history.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/history.xml
index ac03af9143f676eccf20bff01de3f4c5cd351cf5..c6cb030d70498f69546f62d557ba71a63476ff8a 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/history.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/portal_type.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/portal_type.xml
index d1c833ff189609805194d91d2437a1a2f443af13..318e098ff6e2a7ca5451e5459837ca9dab622f28 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/portal_type.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/time.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/time.xml
index fa51ccb81b670d2faa4d6fcedde08a7b57712e5e..adc65b1ab7464d566e2a29974dbbcccb0a80fb0d 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/time.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/worklists.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/worklists.xml
index 1f8b17b01278f4c455558cd9d0b05357fdd86a7a..c3432aa051eac2d67ec0692a384adb38d1b6bac8 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/worklists.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index e0d1ea1e9ac39d1d0d9353874b9ca7b440121f23..bea0d09c49935aac714f5439285e2706b15e1dd9 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-205
\ No newline at end of file
+207
\ No newline at end of file