diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Base%20Type/copy_roles.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Base%20Type/copy_roles.xml
index ac64fe5131eba7ba6b593beafc03dfa76a8b77b4..90a7520754e23ad937aadba222a1afc62763624b 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Base%20Type/copy_roles.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Base%20Type/copy_roles.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/document_list.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/document_list.xml
index 1f0feda65819670afa8127660241aa3a835d0c4c..bbc4d310c4bdf4f8a52d6aec428b09f3be740baa 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/document_list.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/document_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/new_file.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/new_file.xml
index 7da5cf7e1a6dbd60032abfaa7eb83a5ead12f297..e6ce7dcb2cdead3d88fef4f5c57e6010e9be438a 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/new_file.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/new_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/view.xml
index f30b6e8a95e3c940d2221e39f63ef776e161c209..fda7467e00b31e3f413ff178fbce7f6193ab236f 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
index 05e7ae8c184cb2bb9c72ad07b4284d947ceea13d..a0f9697ddb0b9649d17e449a28e7c51c9c1efe2f 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/bug_line_send.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/bug_line_send.xml
index 711b4c527f404dba74cd0305c4717eca9ba92d16..9e92dc7d2d69e679e69c1a265f6e77c1e4b17c8d 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/bug_line_send.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/bug_line_send.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/document_list.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/document_list.xml
index 2c49497d7ca90aeaa96be7e16860522bb68f67ac..367d210358ad8d4f5f541cb134b5ab71cbddb9f5 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/document_list.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/document_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/new_file.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/new_file.xml
index 7da5cf7e1a6dbd60032abfaa7eb83a5ead12f297..e6ce7dcb2cdead3d88fef4f5c57e6010e9be438a 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/new_file.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/new_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
index a2650d47aead4ed74f9831338b4ca09dc6a4762c..fe37b570dc7afa6d55337097a9882ae737b3a451 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
index 34bfb4d3cd73132fe51c0fda55ab7d509aaf75a7..640985e168d654762f3f477c43c208abf871c064 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_report.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_report.xml
index 35232eeaf99c7f97ac735d4246f956ba980efbca..faec7c28e387483cc6b36f30c5eee3b3f26d9912 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_report.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/manage_field_library.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/manage_field_library.xml
index 9fd9f81a8d4672d9eb614dc2f148d4c37af2df92..f115b4b2a32d405b67d15bf35776e794cc697328 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/manage_field_library.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/manage_field_library.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/rename_proxy_field.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/rename_proxy_field.xml
index 1b7a3dfc3e2ed089b9a9bbe220b6a9969f5a6c49..e1205406c2563dff0987f81cdece7b74145d4a6b 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/rename_proxy_field.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/rename_proxy_field.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
index 2fcc6d2687ca419b9ec75145708c144326165801..2589d01ca80c187c9999b4725ba6faa4f309344b 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
index ed35a37012d65f336851364de96492f8ce3daf72..5173be44f5168f5d0bbfd4dbd205b1e0eaea6273 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
index 87c33613601b89b751885a74a69db7a57a80f2ef..20b7b4d2b86b919a98403ac943c8def9e3824c36 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
index 4bca7a7ec086c074ea4cae015f90831e8d725403..1a71d795e52be4c8b9077aabe5cc558e2d488a29 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@ Revert & Update Business Template from SVN
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
index 60a39b1832ce91b50633261f5afab0faa0ee252e..dba3569d8698c35f8b0b039bab5452d13989fce8 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
index be6efc1842a086d7eb558935e691f856ef4fbabe..686d1a547a32687a4e149730a4ec35751ee2daa3 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/create_term_for_translation.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/create_term_for_translation.xml
index c2e07908defcc3da1f92402a573abad10571a62c..4a70ef4fc38981d5e3156492d5b29fa00b90a541 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/create_term_for_translation.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/create_term_for_translation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/export_po_file.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/export_po_file.xml
index c7d83983f3eed3cfd4d809327834bb12ee005ca4..0777a8f6f33ecb421cdc7616953fc6c142d29d60 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/export_po_file.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/export_po_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_duplicate_terms.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_duplicate_terms.xml
index c6b2012f0b75d0df276bce57e8be1e40a4062fd2..9b68ec178e23bf6b6d41cbda7b38afa65d363170 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_duplicate_terms.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_duplicate_terms.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_portal_type.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_portal_type.xml
index 773f1515a3ee08a14b05b5b5fb52d1591cff4f33..24df64224d2fb174a71abdee585bbe8bf9b65815 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_portal_type.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_property_sheet.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_property_sheet.xml
index 5be94f02fc454362ee0db3dd7c676a9befb76566..9ff60b201a6fd66f49f62ded7216ad937efea7d9 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_property_sheet.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_property_sheet.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_workflow.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_workflow.xml
index c4a2aebebef87b4bc1258943add65b98634c9112..7d431b0dc7797810a6cfe963d96c8d25428974ea 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_workflow.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/find_terms_from_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_fields_by_english_glossary.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_fields_by_english_glossary.xml
index fea629b7387df54afd4d204b7c4db2ce6f731428..aefc180bb95475c626da3f77d8918e1b0d373dc9 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_fields_by_english_glossary.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_fields_by_english_glossary.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_portal_types_by_english_glossary.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_portal_types_by_english_glossary.xml
index 4b717d92870ad0f3e58d28f4510df5d1390dd613..5da7f4230630ca1f0dc372e77c2993af53b7311a 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_portal_types_by_english_glossary.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_portal_types_by_english_glossary.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_workflows_by_english_glossary.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_workflows_by_english_glossary.xml
index 57e447a70166ba673afe399f02894b234ca6e9bf..fbeddb4c98061b7c9bc9914ba1fe406fb035eb10 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_workflows_by_english_glossary.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/update_workflows_by_english_glossary.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/view.xml
index 3974591ad562f46afa8e4a64316ecd7118c20935..3fad45ac54285bce50fa1661e45504736fcf63f7 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
index 7776d9cc0f54ef33019dde3de51d4f337845a449..db1eb0cf85ed1be507bed86b01216047d0832c33 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
index 8e138069ee967c863605040e967f8447c53ef76f..849b84a1418ca010444ebb3004e04f28ae8e7929 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
index 6129281f68dffc2f7f7a1bc1da027f46661fd3ed..ee61680c1dec0dc7c1edb4dcf6bbc459b70551aa 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
index c909d5ba3833a93c3a61b6544a64a5f08eea4968..968ce0759c7b859296c13c24a94237e23d04dc1f 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml
index 13e021b31b68b82608613b15cce759caf167f0b6..3f64942ae7f58585bfea3f9233f15a79b8a56b17 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.catalog_keys.xml b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.catalog_keys.xml
index 7d6996cb9cc91ab4fe5229d7497a904d6d982ee2..a540f9431e9c394244ed71562b197938e6fe9258 100644
--- a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.catalog_keys.xml
+++ b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
index 35d936b75a0c14869de43b7c45c5ee67b5511a99..c9c94486fa5c8beb33551591df28643a3b9864f0 100644
--- a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
+++ b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
index 9d382b705fdfd2968025f343823d005728234bba..3ef0c66cd70e0c093be6be94a73cdb8d48cfb205 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
index e630b90ebfe52032d42bba94cf07dc9378a06184..ebec037a7c4a7500414938b66bf5db603339341d 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
index 2360638941a08baf1557dd9f4341d8b5c58339bd..c51d7da8c2c241f71846e60af3e891437728a5c9 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
index e8e46c2e2051cb03e1e648d3e1750b367a740c2e..81aa7a0ea20d2ae5b88d8114b5bc9a445f75e028 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
index 92ec4e640259d93756ac53fe09f4ce19ebef139c..fd867949d04ff408d59655e6a75f47b4dca90d1c 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
index 5b69ff84da0dd6775cc211b9feea96bc59b3d372..a4958b11b7981b3bd18eb51de9f4ba7b9d62d144 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml b/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
index 72f31fdde44c003c14e6151ca419705212571a43..9ca01f39df234bf629377400e2b7bf78e2949914 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Alarm" module="Products.ERP5Type.Document.Alarm"/>
-        <tuple/>
-      </tuple>
+      <global name="Alarm" module="Products.ERP5Type.Document.Alarm"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
index d0e5cf3b28e7eef78ca05b56d93a9d31067d996d..f0cf6a755605c7aea3ec8013934201abff348daa 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
index d889db850cc40d56f8604890e2200e596c3de582..d18d11ffd68101234ab4d448650cdddf75607dbb 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/core.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/core.xml
index 482604bf79f066241819e3ab6678c3dfa4d91705..a9bd77e7832e8c68be6e552283d73fbf392ab997 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/core.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/core.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,7 +73,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -84,7 +81,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
index 87674f7f48a73f09e7551d65b8c4f604483fea8d..b1f8bd0fdb9226c78d2f66be8e1633d545df3aee 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
index dff6b5e18f9148d21d6d9c0b5208563aea489da3..f0d452dc896d7bc489e307b87fa1b8cfb13a5c89 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/invoicing.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/invoicing.xml
index 69c36fdc6c57c14e670034a8ee1c36a20c01c89d..19c3f9a4b2124d0732fe05d63f75138c317d0c61 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/invoicing.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/invoicing.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,7 +74,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/payroll.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/payroll.xml
index b1a1ad0d4f2995a741ef038d53f53056d416ab1d..e6e52f7899804120479697af04b879c6959714bd 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/payroll.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/payroll.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
index 654dbcc7258855efa1bcfc63f9fcb4df7abf7c4a..908fa640c2b771eb303501dc6c7480af8dbd63ec 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
index 662e6bce034fe0903b1a2e87f1d59050dd6c8dd2..1783f79d4027c03185ea0a160d350f67a8b69940 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
index 750ab0dafdbe82e0d96b8db127adb524fbf5e7bc..991d3b10923200c82dc83355c619b44e5835b804 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,7 +67,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,7 +75,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Line.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Line.xml
index d3ba3b0c36770d56b0c399180c04769a3f1e2a71..57d24c022da06e92e6f9815b3567868906c46a81 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Line.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -79,10 +76,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,10 +93,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
index 9fff16c5660a6299a4868ad1b737c99526f062e1..566e51975a6d16877194c6ead9aa6c4ab39772b3 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -82,10 +79,7 @@ be a problem).</string> </value>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -102,10 +96,7 @@ be a problem).</string> </value>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
index e8dbc1d0d2d32c79194de65760f84c4dc991f70a..9205c454620eb492fc6bdca0bd5cf9b411411638 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -82,10 +79,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -102,10 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
index 9a3500a939249652064d61730b6414d38b4a0454..8710e204cf4a77d51e59089001ce2db7347c7d81 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -82,10 +79,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -102,10 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
index f4920064b062800bf72145361f0d7831da467363..de9bfedac7ad690a9d65401abe9ad91ba82d86cf 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml
index db79a581c648a91f1a318295d5b2ace58c07c7ac..bac1549e24be0b97e9fad0f0530ebbc7ca0329da 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml
index 4c8830c9cc25dd60d8d3c199f47864e02dfe0147..2e2cf6f291c67e7874b8d6f26f2b68ad1463503f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
index bc7515648476a8c2472be1229dac3c9977258e80..70dc7462b9f65bf61a4d11d8eeb69e7ea123f29a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary.xml
index ce0b2c3a3f1df171be766a4c1e0ab7f900c3a04d..3a03ce1d588e24248f4000e6393402429712b39f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary/my_content_type.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary/my_content_type.xml
index 31b5e8f9e2e75dc4b3402e17311c5b62d944d3b7..044bb2b8eaef1742e6559cb99fc3b217e0676bdd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary/my_content_type.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewForgeFieldLibrary/my_content_type.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml
index 5efd7d984b5ae257adc6cbdc600dc6b89dc512fc..10c4bd14e6aaf450aa6ce4b115a6451e08dbe1a7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml
index dba5e549855a65357ea0d46e5126c5394f253ceb..9bf6e2397019934a9951650598f3bddccfcb48c1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/title_orphan.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/title_orphan.xml
index 45feb09f94bb392ffe29106a4d87f40f67cc719d..ac3f7f24807bcd261154c82fe8ba44ff1a25303c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/title_orphan.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/title_orphan.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_afterClone.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_afterClone.xml
index 1f3d6228ab5f6c9ad9e26c73ee81e06a817941e9..33fc16a3d4a47deeb26fd5dc4bb00baccd518bd3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_afterClone.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_afterClone.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_getRecipientValueList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_getRecipientValueList.xml
index c2a31ca73cee6e9e8a74631405f57179aa4a1dfc..24b2e612e5406c70b02ac27bba554b98d9bcfb89 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_getRecipientValueList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_getRecipientValueList.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_init.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_init.xml
index ebe2a3b9bed5298ae60fc8a3f5abf6c32b8c8ea6..6b5424f4c0eb42fb5ad65c722f0813c3357d2f28 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_init.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_init.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
index f76b79256d962bcc6f1a4ccaa686d09196abca9b..35ab1713f0a3334622a0db549fd4e3e9c7da0b6a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view.xml
index 29e4a69583c5a56b55485ccb8cbaf26e15eefb87..07459f363fd75f35bd4c9ab540e555cc48593840 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_content_type.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_content_type.xml
index 165ea927c74d8c92a9a65259e184f75c07e42da7..990ccb805ff6f59cc0e995cf36afddc42f5d7bed 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_content_type.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_content_type.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_destination_title_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_destination_title_list.xml
index 110ed9e3a098bcfa0f9d34b0e7a7dc067c0a3454..bc4ec1e58b65cbf2d97e2d1daa02988a2356dc75 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_destination_title_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_destination_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_source_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_source_title.xml
index 003e31356fe7b95f5493a00dd8ab930e520640c9..f1ffbec732ee6deaf7d82e3a67017fa0eb191a45 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_source_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_source_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_start_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_start_date.xml
index d4104f6b952e6bf2e361cef7bf64910061725ade..fce67ff1639fe79cb363dbf1ad39b4fc6a41e91a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_start_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_start_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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_text_content.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_text_content.xml
index 9574c68e604808db9d34c1e7bf93b37bdd5984d0..04dd472ea0009311fcfab11e6f30315724bac6d6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_text_content.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_text_content.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_title.xml
index 5936fcb0e495909618ff82c815c21e058dc38013..73954daa6d5a2b3bcb5ba43bd5015a3c73b74401 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_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>
@@ -116,10 +113,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>
@@ -132,10 +126,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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_translated_simulation_state_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_translated_simulation_state_title.xml
index 032a1ce37860d8cfcb45efe3f225a285767fbca7..237ce4d684a7f44263b013e6e386b7ec224c5082 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view/my_translated_simulation_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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml
index 162141d970121d0c5371f90662dada9538c2107a..f1a2e65571825d756fb23701808244f9622727a2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml
index c051c4fff92128cb3e64a295f1e4331e8356684c..e0af53f8a6e6d107cd7c4c47cc4aeefbb13b34ac 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.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_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList/listbox.xml
index 63a8767fcf842cbc41a8c7bd24da0225917d1844..2a2fda745718de6977858d339971822928dee1de 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_afterClone.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_afterClone.xml
index da96724de84a4ac3d485b284f41e10765f0fa993..614512b5efaacb9a4d7c632c8d2411998b17a409 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_afterClone.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_afterClone.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_doBugLineSendFastInputAction.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_doBugLineSendFastInputAction.xml
index 73e9c05c66aace472068ea56f8169894397bc351..d4300513fbb4c3fe2ffc6d2ad3480bae8338f5fc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_doBugLineSendFastInputAction.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_doBugLineSendFastInputAction.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml
index 76e9012979bc179482703d39715f5b94dc82e35b..563fc3fb9a7c243dcbe60a998ca6b3e77d1a1ee8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getNotificationSenderValue.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getNotificationSenderValue.xml
index 6e8262af946d7052490c9d2765e68bd910da5833..d619d6fd6237c77ce62823d1f18ad7555e896424 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getNotificationSenderValue.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getNotificationSenderValue.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getRecipientValueList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getRecipientValueList.xml
index a483879939254b5453eea8394b3a4e62a7cf873d..ccef5d08b1bdc84b15fa6acb4823e6efd113567e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getRecipientValueList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getRecipientValueList.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_init.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_init.xml
index 74da0efbf93490bf31d1ec35f8b2ee84c3ff6d36..040403ae9381abdc7ce12313fc7d91bbf33b1330 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_init.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_init.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml
index e1f964caafffc091fe03c5a8583d096db36d8030..40ce16ce82126ee697ccf417cf0b164e711f2d89 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_searchFolder.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_searchFolder.xml
index ab8e10117bb07fd8cc2b98a17e567f75c8efcb0c..207519f928006180bea3888cd66696d2c734d1aa 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_searchFolder.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_searchFolder.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml
index b395224b294e6c7ff94b36a4f8b990db67b469bb..19a1918f8814fac28ca4c16baf1a14a81ef7415b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
index 000b8ce240ec8696f4a3d252f4e1dd11486cc4ee..4c0ac32e7c4016ef0808a75c83baf38cd7636003 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_delivery_start_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_delivery_start_date.xml
index 3fdb305304a50ea42a85067be36fe30f75064257..8cb01d4d8bd2d841464456eb5133d241fb59bb54 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_delivery_start_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_delivery_start_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_text_content.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_text_content.xml
index c75724279cf11fa5825d77c2d72cc7db781f64ae..640b0a4a9ec0fea0a2f25d00081994cb3999836a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_text_content.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox_text_content.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>
@@ -131,10 +128,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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_aggregate_title_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_aggregate_title_list.xml
index 9a8f59331b186122af4f1f9b1c37c883e6a3c73a..8bc4673f3380594d632dd9cf887a934fd4a15ce1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_aggregate_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml
index 7162be9763750d466d9f301ba109196b54a087a2..d0b7f1c76d41d96e12ee448172b335702319de06 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_priority.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_priority.xml
index 684d1cdda7e096dbacd3776194bd1c1b07e330dc..64ed71f1a8853a55c2233b985efbdf1a0fd37562 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_priority.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_priority.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_severity.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_severity.xml
index f044098158b4e5162decab151e5b747c42739531..d822c9291fb1ddc7aebb7487c5ade704d96f91f4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_severity.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_severity.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_description.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_description.xml
index e8ca54fe6bcd6e4969fab6be7ff2298368c6c305..a5c1de735f56adfffe35e412c12d4f016f6247f5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_description.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_project_title.xml
index a2a0908b7b6b928f2832ee027ecaafbf7d81465e..3a5171dc16b63ecaccd00d8d7f0330ec124b639a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml
index 1d9d3445de871143da63d53f9edc64b6d427c133..7a967e2ef3d3e2a9113c9851a7fe9a2803954fb1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_title.xml
index 92c4c5dcb4d0be776a233c2052fd19841bf0f7bd..eadc7f4364d09de9d5436fc9d18d7530841b0d56 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_follow_up_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_follow_up_title.xml
index 11278b7e5e709bc03452c6a5a815adfcd680d31b..95795a454e59ff97322a9cfeea19c1628fa13732 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_follow_up_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_follow_up_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_reference.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_reference.xml
index bc3573e3c4c8020eb4deff4144acf8bea87160e5..142da1c854fd3b9946b6511f397f1048c4d92660 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_reference.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_resource.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_resource.xml
index 11885ae1e52cd3fb0c6007211803d877145758db..4ce24ab0041916d270935fb30bb8330c84c0fc0e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_resource.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_resource.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_decision_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_decision_title.xml
index ac9e4ad46537fd3f029ceb138c74a987665f20c0..9fb6eadaed91c416e60add651d967d10b4e1ecca 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_decision_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_decision_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
index 7b2ee30caf06003f980a0093c2d601f0cc678e21..a5753ec1fc4fb04ec2c8a88d8ebfdaf3f75ed921 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml
index 4aac7e39bb2e58b0bd87570cca3e3bc00a877490..58699dccbf2b261e4ac03311ac4dc03fa8410c98 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_title.xml
index d84c0b05bd287743afce28149460e26bdb2495ce..e38759377fbb77fec5657316af29e1f9787083b2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml
index 858ecf758e1f38640020025febe5b276d34c05c4..0ad08ff88f5be8e2f2fb9bdfab07de13971c41f7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_start_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_start_date.xml
index ceb34bd8a701a883cc129cc66fcf97fd0f8db1ae..e41b597b69dca1a5af40c5de039f79c1a8ee2645 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_start_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_start_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_stop_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_stop_date.xml
index 1fc17527de662afd47fbe0137ef7ab20b12836be..b494c8433942649d714bf6e46968df7a29f31cdd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_stop_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_stop_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml
index f3d405e17f925e53bb6e0ef1244e158f5827fb0c..bddd50e5dfb20c8b7834fc95b3481e320ae235af 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_title.xml
index f6e1e9b2a9290b17ccce93a5ed298de1d73ac867..a030b064d657c89ee9c548778efd122658498cc4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_translated_simulation_state_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_translated_simulation_state_title.xml
index 032a1ce37860d8cfcb45efe3f225a285767fbca7..237ce4d684a7f44263b013e6e386b7ec224c5082 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_translated_simulation_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog.xml
index ea2e66a31b49ef596f79f93a5542543f82531e33..5de10658f9cfc2de963b4ac62aa2fd28f8b1b6f0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_text_content.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_text_content.xml
index 80c52c9c817705a96bdd0d07c2b89e358238d95d..c9f0dd9fde8dd670cd01ecd9da333eccc9b1d3cf 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_text_content.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_text_content.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_title.xml
index 93028208d8bbacab86f1b4f1d695232d34e369d9..9d2011875a52805ea5a0eaa0b7458735d4e53b24 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/your_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewBugLineSendFastInputDialog/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>
@@ -116,10 +113,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>
@@ -132,10 +126,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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList.xml
index 53b13eda83bcbac181b309b5613a2ff796e29ad9..f791166fcc80d35eaf2a0ce53c01261d781db256 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/listbox.xml
index f516abde54d3ce6f692df098ee91cb625faf9648..276e1dc67ba7b329636707f467745d4984b8da77 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/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>
@@ -219,10 +216,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>
@@ -235,10 +229,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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/my_title.xml
index 318d6ff5dd95816b2c8fff63e7af22f716799694..3c7673394590911cde600d39b15a4b86fdbc3afe 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewEventList/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml
index b76edc76626cf9c9858b8a4e7d11c2c499a221de..f7f4ebce62509368f05edc660c1a5061a31eb135 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/listbox.xml
index 1ac74e604ffce11996e0ae2bc354a93e2edd0dd4..559b41ca8046544f02b7773091566a42889c5733 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_aggregate_title_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_aggregate_title_list.xml
index 37da7e75b0adb41ae6ea1bd68dab345bea9e91d9..89ca2af9d1ac0c81eabbcd6d1add8c1737b28b5f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_aggregate_title_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_aggregate_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_difficulty.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_difficulty.xml
index c4d500d339136062a6d8d2b036bb93f6e9601e66..f9bf838210f07b92b9e428b557a4fb7bc58a6dc3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_difficulty.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_difficulty.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_group.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_group.xml
index 8a820caa137d63566772f3a2738e89b7b2901497..09eb1207982baddd35d9fdf169a03162683964cd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_group.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_group.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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_priority.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_priority.xml
index b8ee771d3c56737a8fcae7f30f2ea96e14e02b8e..3ecf83355b262f6b27c3e27b7a731d314324ae8f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_priority.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_priority.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_severity.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_severity.xml
index c6f933d11d8d72143abba3e93bd0e95acabb3c88..9ca9cf7483556455ff8c07fb25d44997a6f50b3b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_severity.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_bug_severity.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_description.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_description.xml
index 07dc3bb1714a5be8c06d788d75046d1ba1aecd43..e98bd2614bed171964af7f47a08b452bd9c82b49 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
index 1471d0cf03a9f236d6f3969bcf174c115f4a7599..e4c8dd0fbe8f1f533682896b7e79cd6fe6dc06f7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml
index 4a1d9a803c87b1b1ea4bc73a1a39d1be56c7f3ad..478105abb3dbdfb239db057b5765ff531dccb098 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_title.xml
index f7c92d3c09f7a68e9e0cdf47f8ca4c9771237954..579914f577ab3a9c2a667abba037360a342ecbc8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_resource.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_resource.xml
index 23dfbb2392bd11d7247d7533ae4ac2a640b931f3..9e65918ce90cd721db6b312bb0ae1f2e1e690af1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_resource.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_resource.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_decision_title.xml
index ff8cd0385113d31c89822292df57df36c1b33b4a..a3429736396a720a8fa97c31912af70103a2a0f9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_decision_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
index 1a6b92d667fa01b27635d245c10f8215aa29fc4a..eed1ec26d86b96774e6e01f1d0a208d9add7d05f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml
index b83e3c851aab81da38359200f83cbb8170be0c2c..45337461f4997bb4fad32f226dc648e9b6906ca5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_title.xml
index f163cb5e2a127beffb5453bfa2b7cf9db84fd1d0..2d8becfbf4a99f4a7e8a4c43f7293a251a75d67b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -137,10 +134,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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml
index d1507c189bc1b168a21a459378c686f4503dfa0e..4cfd5512b9082e6fd2da4059e465a5538c79c22f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_start_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_start_date.xml
index 42bb3f675dc58bada38e6c2134df2bb73ed94f74..8b0b5d0ddb3f56214ae62f5233e3720ca91728ce 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_start_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_stop_date.xml
index ef50cb87a378d5f067d28b2535accd1a0e4e996f..4ff1731074d25767812e4af720659898d41a7868 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_stop_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_tested.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_tested.xml
index 2dacbe1e297ef9de1e129727716c65118b6994f7..eb88ac7fe8d978e756a82a8e6d653b4f3b7988af 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_tested.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_tested.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_text_content.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_text_content.xml
index 13b55fb7926ffa99f075da7de4c1b25fcf5212ff..654b948216416a487401ad4173882e64821d3eba 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_text_content.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_text_content.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>
@@ -135,10 +132,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>
@@ -151,10 +145,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>
@@ -167,10 +158,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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml
index f29ca76d0358ec95ea0b732e859934076ed2e4b0..59ed8e98251b3b9fc60a8893f649ebaf1c9482b9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_translated_simulation_state_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_translated_simulation_state_title.xml
index d38f5c6015e4d3cc624395c801bb5d7eedc5b187..ab7918b80dcebd8a40c63dcadf5af4e1a8505cf5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_translated_simulation_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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog.xml
index 33ea9b0bc8183fbf39834f45cf6e985e293d039d..2eae4d6392814f2af902ec9973e1d28764447ad7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_description.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_description.xml
index 852f28b55701f6babbbadf3c760a9f69020477e6..bfc26f785368cd40aa11c3a0ebbc05586c75141d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_description.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_file.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_file.xml
index 54b426e3a70be7d746825c85ca19bc6791a3e421..ee44ba3f86ac3378377f7bb90c5457814fa4ac02 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_file.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FileField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FileField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_language.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_language.xml
index 6a60300e8d543e6dccf4200f5f84a116b8d63a11..8202921770e0ccd84da11e96f9acac04642d9e29 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_language.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_language.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_portal_type.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_portal_type.xml
index b9ac97a7f55cb0e9ef968720a5bc35b7302f9c7c..25235710449845a24b4668dcc6059791b0fcdb75 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_portal_type.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_reference.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_reference.xml
index fc5b2368f56b272bb01cfe9d6c89c910c28c262f..0baf0e9435cb31a9415cc331a54ffe3f13ff26f2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_reference.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_title.xml
index 280103e1008aa1a6cbf5360a25d0335b9fa75f5e..96b7890b8add1ad649cd1d2f916c7f25ad0fadf5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_version.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_version.xml
index eec835b757be63ebe6f17e4c7764be64d318a102..c3f1d93b76536887ee85ea1b5b8fa5ddfa9ad3f0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_version.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewNewFileDialog/your_version.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog.xml
index f88afb0cf483b4cc6233e661fb87758427306461..2553ea6c3854278d2ed292038633a6cb1846c9ad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog.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_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_comment.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_comment.xml
index fdee9a78d8c870473b044a873a2ae308f2fecb5c..1c60740f0988ea608df41c519b049c7535eeb00d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_comment.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_comment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_send_event.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_send_event.xml
index 18b119a7b4801ed3618db3e0964c51310f19524a..55d819b970f111ab0966d04ae3cead8bdf8d6eba 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_send_event.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_send_event.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_workflow_action.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_workflow_action.xml
index 570df2e68dbc2b8c08ae90387894c574c8f8d65f..458ab040ce7c2bb2c205ff03d3099489c67ccda4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_workflow_action.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewWorkflowActionDialog/your_workflow_action.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_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml
index b24b1e4052ac2a02ab9d437a8229d89a46fbf717..7fbccf6df6da1e17108be1380e5ef915a360631b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.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_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml
index 51a4ce47727b6d857461954be6f317485c4c25f2..6ed160b8cb18af825654896b568da49435babf46 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.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_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog/your_portal_type.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog/your_portal_type.xml
index 48d09313f5982a2a606ac71ff61b08ba0da4e905..04897284ba6724c89c16fc5a8b858c071e55d675 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog/your_portal_type.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog/your_portal_type.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_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml
index dc61131f3c955b976784cb20728444f63eca67ea..3af6731c6fa5577f37443c9d00455862190a9e80 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.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_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml
index 71c2479130b89e65032f930989581670cfd653bf..be77512c190f9f7eca4f1ef84512b122b8af56d3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_createTermListForTranslation.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_createTermListForTranslation.xml
index b85a0612c185b33b7715585bbd06c63afbc4e989..e7c439af0a3e73cc6ecc1e6e13c1d77c3cca9f84 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_createTermListForTranslation.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_createTermListForTranslation.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml
index 6ff235df57718c5e32a00fcd59bb908238dbbec7..a574b316b3ca52b3051ed822dda645d99688dfeb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
index 440400666fa021ca31a6a56f0c292c7fde3aeaac..376963ad6a9f9256122cd138f3ead0dbca061de3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml
index f307b2f3b472a4b98418129be3b46fcf5bb798f7..45aef8327f2dda9c3be5837f9e1898dcba587fd5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePortalTypeList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePortalTypeList.xml
index 842552dc2cd6780ca609533193b306b89f07cd29..f894834dec07675a6debd299359625f42e107a04 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePortalTypeList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePortalTypeList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePropertySheetList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePropertySheetList.xml
index c1cc156774f125426fcd81708a8f6499995eb7a5..662a04109ecf663bdf2933cf9e8b0dc4f0802276 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePropertySheetList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getAvailablePropertySheetList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml
index 31aad4475ee905608b2f70d0b381fe076adaea88..ce752fd98d6a4d73c5df9a8164639fe321cf0596 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldPortalTypeList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldPortalTypeList.xml
index 06bf38e097a933383e529625317425a7286af5ac..76c32958e6a249ca21c9077ac7c56535cf7e3475 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldPortalTypeList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldPortalTypeList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml
index af4000aee9c0bd2908e0ff4cbc51ff9b98e868b3..d57fb379c4dc80a10db3ac5769ef854b27b692b2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getDuplicateGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getDuplicateGlossaryTermList.xml
index dce922c8f605a90aac5bcd250fc9974c6341eb2d..449cc3dd435f139b4db2dc29264b4ee579d245cb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getDuplicateGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getDuplicateGlossaryTermList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getFieldEditUrl.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getFieldEditUrl.xml
index c5be45e0c7093d31ee39e31af8c1c2ba17a1bf01..79ec486dceaeac93d7eeee3592ff07bda608b3dd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getFieldEditUrl.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getFieldEditUrl.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getLanguageListExceptEnglish.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getLanguageListExceptEnglish.xml
index 95f3d54729c6b36d9181fe6759efb9f06271561b..40306330e84437fea07eed75ca43ee8dc5985345 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getLanguageListExceptEnglish.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getLanguageListExceptEnglish.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPOFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPOFile.xml
index a81404fadeec88f485511a05b3a4beee8748a9a3..697934c1f65a9114a463fd6a54e3e0e1a757520a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPOFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPOFile.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetAttributeList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetAttributeList.xml
index 946e6fdbb7655e3b49f15ef93fb33d2791144ce5..c80949e8460b1baf32d073498b961ef8d82d01d7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetAttributeList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetAttributeList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetList.xml
index b7a9dc5df5c44633a9323ac0eb9bd53bb3721fea..75f1185a9e8f29d10f79bcbd47f286955b89ebea 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPropertySheetList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTemplateList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTemplateList.xml
index 4e949fb1d2c2e8768c9e073866d466bc39b493cb..15632da7e0d1a8ebb8dd554bf498bb160305d672 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTemplateList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTemplateList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPortalType.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPortalType.xml
index 18feccb3bde8f0bcdfdbc6b312936a408aac6716..a7abf8f3a49135841afb3f03d8abfd4c5e465cbd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPortalType.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPortalType.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
index 4e92b4e30074cfd103a3c15e32eb0a8f56442f6f..270b3291a3aafa87d1b6be4646e4e073521b1bcd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml
index f85eb65377605d5afbf4007ec0f7c88843779dbf..d56bbd4ce91e21d5a3cd74a37c13fa0772d96ce8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getWorkflowItemEditUrl.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getWorkflowItemEditUrl.xml
index 887c4e965e0ade4f9fbe24eb19a7ffa521d9a626..b4e166c82965aebdada9b2b4cbee296688a8e980 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getWorkflowItemEditUrl.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getWorkflowItemEditUrl.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_migrateLanguageProperty.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_migrateLanguageProperty.xml
index 3ca293a1196711382eeea2a6a5946dc89d320b7e..c7f77456537a684a8591b3f829b2887cc9d5a703 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_migrateLanguageProperty.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_migrateLanguageProperty.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_setPortalTypeDescription.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_setPortalTypeDescription.xml
index 0e6d90a2e72bae68f7ed174279c70f39e6694d6f..83553dab4da98c4ed6b6f6e80383d691e575fb9b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_setPortalTypeDescription.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_setPortalTypeDescription.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateFieldByTerm.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateFieldByTerm.xml
index b2cff64810ef677933cbb6b983f57054402eee4c..9612c54de6e7235c3195f1f9a6bae7a45ca67ddc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateFieldByTerm.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateFieldByTerm.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updatePortalTypeByTerm.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updatePortalTypeByTerm.xml
index cbd52b0a40f870cbec0e4aaaf7062cc9c5bf40e9..26eaad69d582c5f87adfe4c244b38b7b9599a706 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updatePortalTypeByTerm.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updatePortalTypeByTerm.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateWorkflowByTerm.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateWorkflowByTerm.xml
index 78d3a7e7a6175f832e836fa6c27f104c456ac5bd..6697fd8095cb8253353069bb9b7fbb740e99a15e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateWorkflowByTerm.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_updateWorkflowByTerm.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList.xml
index 6ed99a4f1b2c71bd8582067120b7877d3ccd04ee..0a63f2381f74e4fdff60630f2dbf71e0c8164016 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList/listbox.xml
index edbfc5dd10d335d5f0b4a77b22a5dca2d74de16f..4f6bd2d5f20a659f47d767202175bcb0b3d17e2a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList/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>
@@ -190,10 +187,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml
index c9bf416bd3c828dd3f7aa1101b9fd1d68a5e2287..ca01d2ad4ba4e2ed58b735ce54e8d15ee38bd9ee 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml
index 1b8f4b26a199ebe73da3e90daae598153e5f1f80..3ba5e150118d226e912bf1cf8d92c13005f26948 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/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>
@@ -529,10 +526,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml
index ddca7adb0ce2fd4cc0c540095f0c39f97807c4ff..41d799865cd81126ec02a59d056218c759db1e7b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -256,10 +253,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>
@@ -272,10 +266,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml
index 219dca3c2c6ff505950f5e0ce9eb5f4728c7a5f4..49f278027819d3550d66169ee3bf929f394ff8ec 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_auto_select.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_auto_select.xml
index 662b877a6fe91a79aea278f223ecafa6184c87a4..260dd114eeac44c32dec4c83f73e25837dc241cb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_auto_select.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_auto_select.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_business_field_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_business_field_list.xml
index dcbfb88f91da901be63c98add22aef37f87e74d3..e2059022b9c45a5460013608010cd8e2ac7c20b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_business_field_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog/your_business_field_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog.xml
index 1f9d1c644c6b8c8cc69e0ed6bf245b93be4e6be6..7592aad922df891d13238697c675bd28f1c0c986 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_export_tsv.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_export_tsv.xml
index 08d69e0826f379174eb9b72357656005cdf49a91..d7868dbbdbc8f62ffda160217f51acd19a9a9387 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_export_tsv.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_export_tsv.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_portal_type_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_portal_type_list.xml
index 52f4890a9839327575c70e773a53eb4471ab513f..d58eb4e76d84806d43fe276b90e6da31d852cea7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_portal_type_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPortalTypeDialog/your_portal_type_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog.xml
index 3fddb12ae7fd4749b7ffb9f9ade6a0edb08e0c1e..54ba404e18e5eb69c23363d48ba21399cae2d3d4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_export_tsv.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_export_tsv.xml
index 08d69e0826f379174eb9b72357656005cdf49a91..d7868dbbdbc8f62ffda160217f51acd19a9a9387 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_export_tsv.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_export_tsv.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_property_sheet_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_property_sheet_list.xml
index 4842f0a6224f57439f2739cc369b4cba50c5e544..d05595d4998a5221d4db5b06b00ba9ac332a4a22 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_property_sheet_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromPropertySheetDialog/your_property_sheet_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog.xml
index a9b0fa680d45a349280aa1dc893609fecd8fabf6..b1f8114cb13f85fcd99e970dc2f42c02dd0e1c95 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_export_tsv.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_export_tsv.xml
index 08d69e0826f379174eb9b72357656005cdf49a91..d7868dbbdbc8f62ffda160217f51acd19a9a9387 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_export_tsv.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_export_tsv.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_template_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_template_list.xml
index 007b7cbdec4e5edeccee96d8848aa7270f98d488..931aaa0dbc127dcf5affac20382b70ffb9b8f3f4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_template_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermFromWorkflowDialog/your_template_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList.xml
index 4ff5d671320d0047c7cfcacef3aa331630003875..3acb88b42b569a484b74d2fefba4a1c411de094e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml
index dd1f714421793612a3b5a3a96d9d5afc312311c5..91b5472e8f9ae56d78fd1f0592cc9c40f6c8277c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox_causality_translated_validation_state_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox_causality_translated_validation_state_title.xml
index 6aeea4fa5ab3c54ca242b60da48417567d82c33d..2ba7311c6ad181325da8ce10e6959433753647b2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox_causality_translated_validation_state_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox_causality_translated_validation_state_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>
@@ -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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml
index a6f0bbf4a183f8660fb5bdc77de0fdf38c4af161..3fbc4de525bd8eb9f0ca7361784d2e3c026ca141 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_business_field_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_business_field_list.xml
index dcbfb88f91da901be63c98add22aef37f87e74d3..e2059022b9c45a5460013608010cd8e2ac7c20b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_business_field_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_business_field_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_language.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_language.xml
index 9b101e5d2fe28c69efde41cb85c5e81096c088aa..a8d0a7dd023f795f5185e1f523c40007569d5a93 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_language.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog/your_language.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog.xml
index b8ea4e1abaca943e9af79f93b133262e84a16653..ac32d58ecbb33b252fa9f66438be991ba4ddd4e9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox.xml
index 55d3193e3907960dc5314e56bab3c6472b7307e7..9d43cd8d36abc367cec007bef3599381a5a2c336 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/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>
@@ -513,10 +510,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox_term.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox_term.xml
index a40268e1b8a417a02cfb2c0bcc69809a72e82f03..fa89c17579c4f2d2e8a63dfa3c720564208528c3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox_term.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPortalTypeAndTermComparisonDialog/listbox_term.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -256,10 +253,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>
@@ -272,10 +266,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml
index d325311471968d30453aa7c6b4c1a424b6bc7335..dbb673d0882cc2d2d052259b23b549225c06758d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog/your_language.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog/your_language.xml
index 9b101e5d2fe28c69efde41cb85c5e81096c088aa..a8d0a7dd023f795f5185e1f523c40007569d5a93 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog/your_language.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog/your_language.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog.xml
index b61e207b39be57628178b1b6bc2990ef8eb12f31..d94b15a56bde90abe6c75e2188e6e86ab4fc594a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml
index 308af29342c07404ee33b781003c3b618205434f..b17f58566375776899fd0899afd38f20517f02b3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/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>
@@ -517,10 +514,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml
index bb99898488fd6e9b8b20d817d5f8841a3c93ec21..c67a4cff95cf9b4d470e78b61833fce1cf2f6c80 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -256,10 +253,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>
@@ -272,10 +266,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog.xml
index 9e507c02dc2ecb88763d987be87ad1e96d4e225f..33afdaffadb84c274a468496619e718fb7512f6b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_auto_select.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_auto_select.xml
index 662b877a6fe91a79aea278f223ecafa6184c87a4..260dd114eeac44c32dec4c83f73e25837dc241cb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_auto_select.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_auto_select.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_business_field_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_business_field_list.xml
index dcbfb88f91da901be63c98add22aef37f87e74d3..e2059022b9c45a5460013608010cd8e2ac7c20b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_business_field_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowUpdateDialog/your_business_field_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
index 670681f843746ae8686b91e9ab66fc034c2ebc15..4f10a4bd2261de8dff05123f9895ccc34d1940fd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getCausalityTranslatedValidationStateTitle.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getCausalityTranslatedValidationStateTitle.xml
index 2696870fd91413391a63fdc046f169399cd8e5f2..b591cdfd0ab41efe01834791671035f804333364 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getCausalityTranslatedValidationStateTitle.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getCausalityTranslatedValidationStateTitle.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermCount.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermCount.xml
index 46a343673c5fa2d19c8c2c5366ecad6e54c582b6..7670b3599af9001451d1c85537aae03c1d378b13 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermCount.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermCount.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermList.xml
index 42c27ddddaccf4c0c178bb7ad7346027bb1c8a36..35341eec2b94a38d5437332d67c67b66c93418ea 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_getDuplicateGlossaryTermList.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml
index ebb6436c3ab99ee04f330f019981eaf12dcab2e4..0d828f801da39a170ce7fc1cafd8a70097a747c4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/listbox.xml
index 3cf212e553d4e32374547be95f8be08f3b66e1f3..59cb1747a8bcc0cdebb5c3b4f92170d2dea1d693 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/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>
@@ -519,10 +516,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
index b6423dbeff15878c97aa0b80d3dd4ac47767c5a2..1ebe4912fac1feaf99de5b06bc5af83feee181c3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_causality_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_causality_title.xml
index 818b2dfa5825335734590512f8028265f06f1a45..7ce95ec709b75d337b20cfd68439b275c2c1ecbc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_causality_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_causality_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>
@@ -209,10 +206,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>
@@ -225,10 +219,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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml
index f0bce9de63bb454e789b1ac5fdc8b3c2d45f10c7..494fd0d07c3d901496f7a16653f10beb1af24ae0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml
index c836486e3f062307888b0412fe8877f8c6011895..a259fec824bd79181dffca133f5f5b32d7af6828 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml
index f9b3b591b5d6d459328bf266f1d04cfd5680a0fe..1b5a591bb99e52f0be782d86b902b951063cc35b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml
index 10c4a48f29de23d1145a2dc3db1da6194b3767ef..b6fbf23a4846ea18a330cb9f551473f166abd2ad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_title.xml
index f81eec86cadbb4120ed3c91b571f28b452aec7bf..9e6b690c83c1623f0ba3de4c014e755697fc7405 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_translated_validation_state_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_translated_validation_state_title.xml
index 09b130ec8dc4c4de9f6b06bc8ba79e2b8f5b2ebe..38145b50e8a7424c4cdb506f157dc47f42de69ac 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_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_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_viewHeadOfComment.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_viewHeadOfComment.xml
index fe469084e6112f5bd67cffd1afc9f0460772e8df..4e52288a31bde375d08fe0e767d6b5a6dbd44abe 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_viewHeadOfComment.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_viewHeadOfComment.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_forge/SkinTemplateItem/portal_skins/erp5_glossary/Glossary_setGuard.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/Glossary_setGuard.xml
index 76b2e5c29503917bd667af28b3b74d6bf44b3fa6..7a17a32413ae850dd2e25ba8709036070fa0c58a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/Glossary_setGuard.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/Glossary_setGuard.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml
index b8bd47c74aebe27921096aff53b7c985da9ce810..79f1fbf8f62d45219c3712d25431136d791740c5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml
index 3eb89718370c52fe8da144a911c3515b46b14a6d..b91aac5645f21e0fa03ae5d060c310db137e7c31 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCheckout.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCheckout.xml
index 5091dd263721db4d29055cfaea19934194410adc..7bf09115b9ebb1f2bc4822f77a931794138d2c26 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCheckout.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCheckout.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
index 1d9199854a6191d26e5ce2a926ff3cdbf6cffb64..e669a9ef6ad298c4a5eb5f98ebd7f63f3be685c8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
index 047a70ec3762b0199f6fe06c59cebe0ef4e26895..3b9f0e530404231748b093e0ebd7ec040dd9e298 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCreateWorkingCopy.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCreateWorkingCopy.xml
index 3cf4dc57aa07178edbf23708bf53b4f9563217bc..6d585289b33688371611318d40aa38a3aa953d92 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCreateWorkingCopy.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCreateWorkingCopy.xml
@@ -131,136 +131,3 @@ REQUEST.response.redirect(\'%s/BusinessTemplate_viewSvnStatus?%s\' % \n
     </pickle>
   </record>
 </ZopeData>
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>from ZTUtils import make_query\n
-form_results = context.BusinessTemplate_viewSvnCreateWorkingCopy.validate_all(REQUEST)\n
-working_copy = form_results[\'your_repository\']\n
-context.getPortalObject().portal_subversion.createSubversionPath(working_copy, context)\n
-\n
-query_string = make_query(portal_status_message=\'Business Template Working Copy created\')\n
-REQUEST.response.redirect(\'%s/BusinessTemplate_viewSvnStatus?%s\' % \n
-                          (context.absolute_url(), query_string))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>REQUEST</string> </value>
-        </item>
-        <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>REQUEST</string>
-                            <string>ZTUtils</string>
-                            <string>make_query</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>form_results</string>
-                            <string>_getitem_</string>
-                            <string>working_copy</string>
-                            <string>query_string</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_doSvnCreateWorkingCopy</string> </value>
-        </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
index f71d4bbbcdb803a22a18c1e08d5cb6717bde4ca7..cadc764ac63b49408d32d17c21c80c0c41d0e7c6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml
index fb004379edfe7cb90b5458363fcc9576ef803210..a06f3e04e0ba0c81b49d3be2b5887c485b3bb059 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
index 775b061bd717c5ffd33ab776c3c4fd3d7cd62531..060c67259e0f634832ab4e5797653911b94ad525 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
index 4b7725f7f69cc881ff536739beb1801e3fe102b8..57d262e23b65937939b498339c59614bfb94682f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml
index e3c009566161b590fcc9ab2dfb8852af96f84307..962881fe18334980f3ca652336a44d4c016b6ad1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
index 006af737683a077633ae4a8041d17aa8f3dc7b79..c91799a3f4cbcdf3696dd7c67a87c544a0d7d181 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
index 0b4e2547e30131922a3ff2b0b72d66786115fac7..466acd0db5d6dba0597c26b600fae0c3a7c39ee9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
index bba393009eab95526dadf6f8412396eec2ba9536..d3142a96083e9d2655e4abe938c62eb949c201b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml
index 2dbdef3d8c0b80c982afc72168bee76b9455ff5d..d5fabbd10ec1fe236f08ea079d314b8c936bd343 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml
index 06e1d5678cf55838cc2c0b0abfcafb1267f95d13..bdd979207e0eddf7f559037bd3d8f474c5998869 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
index 0d4f3c0f17d63c4df92f4ecf09fa3da41b31dd61..598a12737a961587dbfa16fc8ba0e5fe8901ad03 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
index 3caeed7ced58ce4d1b5c68e4be30af84d3a028bf..d99782494ac93e66ae5df230205d1318d8d00fc0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
index 0810b9a7007ce49c2fce584dfae51292cab42ad0..867e9334c37d21387a18e886bc5a65f20fc8af2c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml
index baec1b09b80fb01148990b7c05ad02f9c91cc93a..0b9613f2fab61fe56ef24ca6d1f0ed16d3aa5054 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_getRepositoryURL.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_getRepositoryURL.xml
index 1742215fe411f89ea3af7802d89270f0e77481b5..62ac73c04f1a563fc67c09ae15e3f8cb1c860bb0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_getRepositoryURL.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_getRepositoryURL.xml
@@ -57,7 +57,6 @@ try:\n
   return context.getPortalObject()[\'portal_subversion\'].info(context)[\'url\']\n
 except SubversionUnknownBusinessTemplateError:\n
   from zExceptions import Redirect\n
-  from urllib import urlencode\n
   dialog = context.BusinessTemplate_viewSvnCreateWorkingCopy\n
   context_url = context.absolute_url()\n
   query_string = make_query(\n
@@ -110,153 +109,6 @@ except SubversionUnknownBusinessTemplateError:\n
                             <string>context</string>
                             <string>zExceptions</string>
                             <string>Redirect</string>
-                            <string>urllib</string>
-                            <string>urlencode</string>
-                            <string>dialog</string>
-                            <string>context_url</string>
-                            <string>query_string</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_getRepositoryURL</string> </value>
-        </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string># try to get the repository URL, else redirect to the dialog for creating a working copy in one of the configured repositories\n
-from ZTUtils import make_query\n
-from Products.ERP5Subversion.Tool.SubversionTool import SubversionUnknownBusinessTemplateError\n
-try:\n
-  return context.getPortalObject()[\'portal_subversion\'].info(context)[\'url\']\n
-except SubversionUnknownBusinessTemplateError:\n
-  from zExceptions import Redirect\n
-  from urllib import urlencode\n
-  dialog = context.BusinessTemplate_viewSvnCreateWorkingCopy\n
-  context_url = context.absolute_url()\n
-  query_string = make_query(\n
-    cancel_url=context_url,\n
-    portal_status_message=dialog.description\n
-  )\n
-  raise Redirect("%s/%s?%s" % (context_url, dialog.getId(), query_string))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>ZTUtils</string>
-                            <string>make_query</string>
-                            <string>Products.ERP5Subversion.Tool.SubversionTool</string>
-                            <string>SubversionUnknownBusinessTemplateError</string>
-                            <string>_getitem_</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>zExceptions</string>
-                            <string>Redirect</string>
-                            <string>urllib</string>
-                            <string>urlencode</string>
                             <string>dialog</string>
                             <string>context_url</string>
                             <string>query_string</string>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml
index 52d65aa35004a136ebc0a50e9738c6a3b9759b8e..a3c7bef31a05a5d1db4325376827ff89f08a5979 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted/listbox.xml
index 1bf16a0373d3289f33c2371ddfa06e312f2993be..586e18c3f4fbc7f6ff02e8e1c6e5bafe7d33c6b7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted/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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
index e697b83352d6dc28efd66556aefa54a31e73524e..a3ffe893f98cec005bd88ddbb52ed3c153aa7a5c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml
index 409dcfe088fbb39671117f62322f5f5f4f6cb25b..26149464810388f798d31c8ca18f2d05f1a0f3a1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml
index 9c7dd8d02ff9b323c7eeab2c095675ff097d81fd..339a7b57d6dad29c33978bc60d792242e9b6daf6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/reminder.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/reminder.xml
index 59598f8ef93415d39c0b477f9f4a7de3e3a54b02..6108d4183d30c97fb641de5bf6478940f0882e4f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/reminder.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/reminder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -292,10 +289,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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml
index bb9406aef605a3d163a72e7c0e3bb2bf37a12747..2ebbea10598fdebda82c795520be7b66b28b11c8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_added.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_added.xml
index 65520d4ddd24097751a8b58d109de3315a8edc91..78faf958ec5de4db1bcba36c667edc5cd3118ee1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_added.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_added.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>
@@ -268,10 +265,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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_changelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_changelog.xml
index 15af73b777b5d5787365f33f7ef105348e2f0313..c5f83d4e34301a8ca312fc90a3f3a63063404714 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_changelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_changelog.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_modified.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_modified.xml
index d49d387aedfd7244beef979981238290bb41be96..f8910c7cf1a7e06dc65b87412ff1e02b6fc2c3e6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_modified.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_modified.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>
@@ -268,10 +265,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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_removed.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_removed.xml
index f83b09ff5d62a3be7985016c4aa7aa0cc600c0ac..4847b862e9a7d1130de868e367e32914d84468a8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_removed.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/your_removed.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>
@@ -268,10 +265,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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy.xml
index e020669eee9ff75a46689f130aa0cc706251cee3..4246afecff617192f20bb3f91efd3cf9eb0b7186 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy.xml
@@ -143,148 +143,3 @@
     </pickle>
   </record>
 </ZopeData>
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value> <string>BusinessTemplate_doSvnCreateWorkingCopy</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>This business template currently does not exist in any repository. Select one of the Working Copies below and an empty business template will be created in it.</string> </value>
-        </item>
-        <item>
-            <key> <string>edit_order</string> </key>
-            <value>
-              <list/>
-            </value>
-        </item>
-        <item>
-            <key> <string>encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>enctype</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <list>
-                <string>left</string>
-                <string>right</string>
-                <string>center</string>
-                <string>bottom</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>groups</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>bottom</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>center</string> </key>
-                    <value>
-                      <list>
-                        <string>your_repository</string>
-                      </list>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>left</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>right</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_viewSvnCreateWorkingCopy</string> </value>
-        </item>
-        <item>
-            <key> <string>method</string> </key>
-            <value> <string>POST</string> </value>
-        </item>
-        <item>
-            <key> <string>name</string> </key>
-            <value> <string>svn_select_working_copy</string> </value>
-        </item>
-        <item>
-            <key> <string>pt</string> </key>
-            <value> <string>form_dialog</string> </value>
-        </item>
-        <item>
-            <key> <string>row_length</string> </key>
-            <value> <int>4</int> </value>
-        </item>
-        <item>
-            <key> <string>stored_encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Select a repository</string> </value>
-        </item>
-        <item>
-            <key> <string>unicode_mode</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>update_action</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>update_action_title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy/your_repository.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy/your_repository.xml
index 87485a78b879c315338e111501ad3ee88a8a6fc6..edbf54de95f610c44dc5e8ad136c52d5459ae0e2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy/your_repository.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnCreateWorkingCopy/your_repository.xml
@@ -263,268 +263,3 @@
     </pickle>
   </record>
 </ZopeData>
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="RadioField" module="Products.Formulator.StandardFields"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_repository</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input given.</string> </value>
-                </item>
-                <item>
-                    <key> <string>unknown_selection</string> </key>
-                    <value> <string>You selected an item that was not in the list.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>orientation</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>orientation</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string>Select a repository in which your business template will be created.</string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>orientation</string> </key>
-                    <value> <string>vertical</string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Repository</string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python:context.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopyList()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
index 3116d4ea617feef0a161ffa21bda26c03c9014f8..9fae8f3b5a013950e18629838a4e73d338f05d4f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -127,7 +124,7 @@ here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
 </tal:block>\n
 </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -141,9 +138,13 @@ here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnDiff</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Diff</string> </value>
+            <value> <unicode>Diff</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
index 47041bc212b871b68d763a2398ab5ddd2032da69..c475541c95c16ef06bc887b31fe8a807f82d6d4f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -83,7 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 </tal:block>\n
 </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -97,9 +94,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnInfos</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
index 7fe654c855c36688e2077a93bd2993cd9ce2ee4d..545f69933f16b9af2876fc5b40d5676b1e15cc18 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -89,7 +86,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 </tal:block>\n
 </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -103,9 +100,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnInfosFile</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
index 9a0b0713f9da9efbcf0ab11859b99ed6849ecc5b..6226f115d8d0441d269513cc8710a7fa5c04bdc2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
index 07242a269c8ab383e2033a6e1b15a7b6efd00b5c..3618fceacc96baa773e8561f016184d89ef947aa 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox_message.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox_message.xml
index 248bc31d481a3a4b90fadbc4d2dd9e4139cf7f06..d65672447892bca1aa71fcdfce4f0cd0abc3a2cc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox_message.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_file.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_file.xml
index 1cba02cd4b92853059b6b030e187410686dd20a9..5ef80734a07d495ae6bb9ee25b2aa248b8e09498 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_file.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_file.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_title.xml
index 7702b316ac8e44fdac8fc3fd912c293d47baa608..5c68d25ed64d9bcc793294744ba016a06ea28391 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/your_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
index 4aec77811ed8c7b8b01904de04bed6764de15d58..0375cf55843965f5fa9e7e5406ed4617b43e92ff 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/realm_txt.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/realm_txt.xml
index 5ff4eb6c9c86f8513c54e362968aa9551487777d..07aede694348e5b4f9ad2c41e5fe2a69404264fb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/realm_txt.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/realm_txt.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml
index e4c42ab5513d8f4e7bc778819ef60fa863539aef..2e7f15407a4ddda6dd1bcc19adb6b1cb10c92d8f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml
index 277634c05061ec5109a2ff63d82cb8c60b00243a..9c19cf86b76e48bdd6fa6b3bc6c74856b76c7980 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_caller.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_caller.xml
index 76d6cf305780f5e7ce6af1d38f7ceb5fa2f6b35a..8715f5a4aa208dd7e32faa7446e1b7561a9bb450 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_caller.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_caller.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml
index 7a7bc52bf683393325ffdb0ae2af6cd16375345e..34301b9d74d42897f3490e325f56ce597d10bbb8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml
index 174524b157a04c985eab363eae1e574190160a5d..68d419a450c6996d537309e90b04613d49eb994f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_password.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_password.xml
index 710339389f3a48bc3bdb4feb61fab97a151c0211..1e6b89d3fda579931fd1fd9fb3b8e63170ab9943 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_password.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_password.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PasswordField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="PasswordField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml
index e18bef0b6aaa6717bf644e64ec0176280761610e..0f7485bdaed139269adba8daac4e7ecef9635d55 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_user.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_user.xml
index 32b5e32ee38846d52d79d86238faf95167256780..4a9056d9a52c5b04e3336361dbdbf91d3081c95a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_user.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_user.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
index 58120d5db7f6ceb450271bfe0bf356065d5e12f2..a813030947071dc641254480048a96a8305f4375 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -72,7 +69,7 @@ here/diff">diff here</tal:py>\n
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -86,9 +83,13 @@ here/diff">diff here</tal:py>\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnMultiDiff</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
index ef378b6e85c8155e53b3060eda4f2d7136f1d8b9..ce5b27fc9be264905a76e2ee0796493dcdf190a5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/failures.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/failures.xml
index d77ac1c5b97fb2d884e142cbdd6304713cf3c51b..92224dce6adcf5458ae6303018fbca0aa8ecbc82 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/failures.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/failures.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/fingerprint.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/fingerprint.xml
index 579f49673731c0fd5cfb2d2d39d9c7ccd35a1c5e..ec648ecc888fa585677fe6589a0cf65199607645 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/fingerprint.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/fingerprint.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/hostname.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/hostname.xml
index 24d1046f47d9e29813e543639d34fd68fd1200a3..c4e7c5a825396025a7a7bf40eca6426dd42dd07b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/hostname.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/hostname.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/issuer_name.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/issuer_name.xml
index e13ab124e97b253e1aaa8e3eaef95d1b451c1991..87c9d2845c26ae6ae84e36fbd7bc6be4e1924bb8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/issuer_name.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/issuer_name.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/realm.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/realm.xml
index bbd7b2675e2f5339a06f25edd32ae2313d6d21e3..a437ae06fa5cf98d89c7f5ef690606a75d27f57c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/realm.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/realm.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_from.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_from.xml
index f45e55c83bd3ac8f7e397bdb127dad3a054cd90c..fed54c6ac1cd522cc3743003a7cc77fec4f94bc9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_from.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_from.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_until.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_until.xml
index e159b144297ddd634d2136dd24789967b15ca42f..02815e5a7ad680c09244dca971416d7c5f2f6d29 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_until.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/valid_until.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml
index e4c42ab5513d8f4e7bc778819ef60fa863539aef..2e7f15407a4ddda6dd1bcc19adb6b1cb10c92d8f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_caller.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_caller.xml
index 76d6cf305780f5e7ce6af1d38f7ceb5fa2f6b35a..8715f5a4aa208dd7e32faa7446e1b7561a9bb450 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_caller.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_caller.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml
index 10a4faade2a4916bdfaa9f677e25badbf7a7891f..bf61ced91080a3da77901dbfb87abb3e572f1f23 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_failures.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_failures.xml
index f1fdb34cd4faf7cd28be3a4489433df3bfe07fe7..aa44474933ec844ce2cc12927d6a1b0e2bdece41 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_failures.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_failures.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_finger_print.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_finger_print.xml
index b40534873f2b5a724215e6d6b9fd8b9b0bbfbfb7..d51a322496839f6dd4938d482955812ecae5b16b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_finger_print.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_finger_print.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_hostname.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_hostname.xml
index 6ed87c82d27f6f0d8f784497fa63af02fe40c276..fb1eb995b1e4a94793f4a5df12708a2b812fdd0c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_hostname.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_hostname.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_issuer_dname.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_issuer_dname.xml
index a989cbca225f3bdd35a73af75207eeed28ffc0d6..edd65934e6179a88b69e3aa8152ffd5f88d4a39d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_issuer_dname.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_issuer_dname.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml
index 174524b157a04c985eab363eae1e574190160a5d..68d419a450c6996d537309e90b04613d49eb994f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_realm.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_realm.xml
index 998bd3fa767de821beac5544de790c06b70a6211..85641daf7d362944a26cc9819bce2d4b23a7083e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_realm.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_realm.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml
index e18bef0b6aaa6717bf644e64ec0176280761610e..0f7485bdaed139269adba8daac4e7ecef9635d55 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_from.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_from.xml
index da850e9376964f3c2ada0ab2d110e391570a2cd9..612f17baad53b26c326d608abf0201ed67311050 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_from.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_from.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_until.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_until.xml
index da64939205145511fc09e534fd66d634f1652452..b69a8120779781c306d5c3547c805c8688d03f0a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_until.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_valid_until.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
index de7a20df2fef727ab50db267903e03f016875078..8cdbd535a23e899d09f35e70e250850ecd3d748b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -72,7 +69,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -86,9 +83,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnShowFile</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
index c88d134a777c1e2d412f1f733f0386748ebccaa3..4709024f3e5f5cadbe53c7eb01c1eb96b25e5d7b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:replace="nothing"\n
            xmlns:tal="http://xml.zope.org/namespaces/tal"\n
@@ -169,7 +166,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -183,9 +180,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
             <key> <string>id</string> </key>
             <value> <string>BusinessTemplate_viewSvnStatus</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Subversion</string> </value>
+            <value> <unicode>Subversion</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml
index e92e8ef4cfe62f91e37a2d067a9a0e600eecd50f..1454492bd1dd394d1137a785f752107924bf931c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.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_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned/listbox.xml
index d685525202a0392fd4e1d8d65466ce22f6d55c6c..a5ee41c387cfc288ffee37f05e3af1af5958d960 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned/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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
index 7bd077d4804a291c66123f2d8ab1d14fee77fc4a..1df1869673d5edd29fe3b2cf8d3dc9841b32ad76 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
index e4c26a779ea333730712b5a9a0e72f253727623d..17f65146ca2766a0136847257def769267fba0d3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
index ce177a1760490e6ea613596e0101b1c502c39eb0..827db6522c2d4aec48d77690da1109e8164c7ca7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml
index 0f9d43d9ccbd3e9319c912d81c67af11803af33a..13bb0d629c962a5d674156b1e15212a574b0b593 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.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_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml
index 7ad2f53cfc8dcb00b6285dc4725809dd9dfd8fa7..791987a9a470a4ec95d8b3ee7a2ff5c062e34ed8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.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_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml
index b7b6694c6cc48485024222834b87cc1cb81123cf..64b32e821ccfe89e34e73d50e8941f9bc271d807 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.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_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
index a38bfa72e65bd79161dbc9fa4bb6c28dd384596b..0202d2b6e355a7fb1cd85742c221654915f34092 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
index 0e1019659bf1b45a7b7a3d774caffdfb5bcc12f6..ff2315adc55701ba7df87e8e429e90d3e479fed8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
index 92b9cb0a964d09e48ff56708ec2ffd9023684a5e..638b288b0a6ae17c81ab1d83deb820c994f57c09 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
index 4e12c61398e47ee64cd57ebd2dfb5a7b24f3bef3..b9b8145de8f39dc3d6388fd77b4132bb3d207ef0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
index c5d81253d446820034d523151d20606150049ff7..8331a266517db5879f81c5b84f25a841834e9621 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
index 47f21ab72cba90765603cd1d6bc1104d99cb27c9..f35d9843a24c5308d9f14e1a7f6606c6fd67fab3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
index 14b757955fe9084c790e1cc4540fba422a001112..038aedffc5fc41fafd0e46f59d7a825accb9a896 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
index dc20c1514e7cc16b7f068ce4ab6c7f36ffc2a7eb..9fc531650203a8ea93ef8a14d9964c096f2d28bd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
index cb8d797f3bfcd4aac4204b3dadf9c874b79676bf..0681836181dfd8de6f64c76aa91e570873a2264f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
index e6dd8191b529b5c35985de4e24be7d7f938212a7..037947dc34efa99424c90a3160239b54d109fb5a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
index 9ef63574912da67b22be1e91bbbf196551410488..984506130f3651a3d4a0683cbf48478b27040b4d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
index 7d949e44d0cd08c8a986136590b08776badf03cd..44b790575ea122c4a08019087b5d232f425e2c66 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
index 29866a72408c8dcff68de3d1a14769a19c76e051..d53695de605b8aa15bc956bb2e1f6b85729af343 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
index 69a2597cbfc4ad58ad6aa06832ac72705f379044..86e0503eb453c447c6a66d3f5db87a00f75c518a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
index 0890d22ff2889d2ea10047588f3b8ed6b45eea7e..db0218c2dbb8988f673af0cd4e7961edf975a0dd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
index 447656fa41aec92cd000007113153159384387dc..ea300e2761b928ab070f5b90df542280ff99a129 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
index d6c51768ba101ddd454669e8d0eac5f338fd882c..4fffe66237c2bfcdbe64d180958473ab84a260ab 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
index f8aab66dca51c7899a326768494ede4d9b1b4a33..3de697bdddf15365684e37e2e39f30aa2e6f6018 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
index 71c847baf8ade01951c81f02c92c051fbf3faffd..89f4302d7471465f381c575a16b29bcd51de92bf 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
index a754e8772156727f9783c719eaadc63c0e2adb2d..8d3230f0be0f91174f28b75a689c02121babb5c6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
index 866d88e9be5d31a868a0302446bcfdfeba2f82dc..0b8be36916ad49ad6d0c1d104e29ef964d537e3d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
index db629c619d0b37d75e55667f272b4a0eb30424d2..49b7d39712e16cb899f2c30016ca31c4148824f4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
index a0986526568d6e636e01aa5febbc58da775b3f71..62b9349fe0c4d2ab7adfcf54253ef14f008ce8aa 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
index 75623fb2e5ddfcef1a622ced0435095f9e0dbb5a..989c9b58d056984dfe441d3ad52f11abf94f81b7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
index ebbc8e64f9c5c27897e57a0b062438b76bd50e3c..10a5e5c77b8def41332eb6f38e74e8b594d79c21 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
index 65cc097eda65d9d208a28778d8574be06cda558a..7b541824ff369e9ebdd43a0336c89ad1a06aa90a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
index ac987e6c4020232e31b3ee6d8a6caa906c8e859d..7f0af20b1c4d2aaa87834c5356ebfa62e0d36a8d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
index c2a759d32db0ce31263403ed13bf387bc0902934..fece6112ac207f1a1848fe4dfa7b1de4ed5dbc42 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
index 7af195ab5b2422cefb04aab1d1718e55d460388a..94a0141f996051300d396ccfe9c3be01b61a26e4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
index dd299b4a9c03c682b7fb78b32f17a80b27db7d2b..66db1a061d3b9ba99b3bc5175282ffbc29b9acff 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
index f8da6c2c4282bc9eecf03f702cbaa402ad4fb942..2e59a77f453b1cdff94d6f3c4f8a3158674e78c9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
index a099add7317d0a7cd74142e6fe635cf88402ad2b..3338a182fc760b02ace913dbdbe19c9f38e6d074 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
index 8caa391418b0eae1bfaf839a06fa0ebe1f0386fd..e0d5e19b125e2059d53918dc4279be81c108ada3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
index 238900525c74ee94832b396d4138d049cb3fae22..799dd7745e3713bf0690d167594c45666379f5b6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
index 7a605ec6ac7c0367e606aadf7a585aa604759516..455e89aaaccd576c8bb40d4d0a7eb7590fb1a098 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
index 944096adef06b2074f4cd4e5a3b9d164ccaab994..4d804c49c3d9b43c2f7885cf55d238f6bb4b04e3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
index 1bf04ac36293a32b7531f117d75e5701b06066d6..1471c053d1c455ec9c04412fcb1a703fbb724ac4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
index 0228d8921f8074b3ebbbde3a23eb3088bf408b3c..9a2c00d29b1a9f8618912a10c5fe8274db0cd283 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
index 2410cba54abfef88562ee560e05e78ddcd4ef465..7756cdf238c3a0b83900901d17922375cfc73bca 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
index 4a769a62eefa8ae62e30ebf3a59643fb4b39fc3a..d6857998940117b38a3d1ebf3ae0517c1343e46d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
index 3c08c15de057f0c70d45fb549cb022114767ba50..634abf89d90d0af2193a7accea2378d33f04e354 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
index b273e02bdfe710f60427790a63519ff342df7b41..64351870c96447274a49cb4c4e4151eafcf297f1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_user_name.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_user_name.xml
index dbf7e0bde27eb24f5a4f7219631320c45467b6f5..8f477e02dc79720ec56017230ef88eb72c8ff33c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_user_name.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_user_name.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_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml
index 8be44c7ae5837bf008e5d1b53528c1214b0012f7..56b91e99146f405944d2b04b09f5df8cabe7bee1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_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_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
index 5c6c88f54b20ddb82da123629df9e3cafd14592c..66a1a09e73504bfeb46bcdbe82e338e59953f521 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml
index e4b8c07fe711afd0201cfcaa9312839bfc1ec2b8..e092f242a2c82a040acd5c65adfdd61259bf4518 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog.xml
index fa238cae9672b1fa87093935183c00b4a67cb3e4..c9323fd7070a68d73bcbbab265b25e85a8074cb0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_group_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_group_list.xml
index 65938417fd84de1d7257a6e87a188a0d8cb83f83..1757f3e3c20253d4de3b4b4e7fdea5f76d5dc642 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_group_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_group_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_list.xml
index c1e6e36ce3d8fa427f237af6deceabb244a234e7..b1b301a088b86e114e4d5dee0c9991ce03e9320b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_list.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -260,10 +257,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_remove_existing_roles.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_remove_existing_roles.xml
index 6795098eb58ee5a2d787bfbadaa8ae35941d0fa1..958799f24baa34768d4a6145d4e3453a14809d67 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_remove_existing_roles.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_remove_existing_roles.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_checkSkinFolderForms.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_checkSkinFolderForms.xml
index 7d0fe378ed2eefeb121d5d5cf6c60ae18ea144b7..d717d27cf002f0ab61bf461351b29a38055c4ddc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_checkSkinFolderForms.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_checkSkinFolderForms.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findMessageListFromPythonInProduct.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findMessageListFromPythonInProduct.xml
index 757d8463a65f0d22ecdf725fb666fc0bd55688ee..ade8f02b53b5274f73aed68f787138517cafd2e5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findMessageListFromPythonInProduct.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findMessageListFromPythonInProduct.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findStaticTranslationText.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findStaticTranslationText.xml
index a9b6f813a17ee8f71d09ea7140061a359ac29beb..b072c37e6d9d84b688c50858f5c7c364c5ce56c8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findStaticTranslationText.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_findStaticTranslationText.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getActionTitleListFromAllActionProvider.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getActionTitleListFromAllActionProvider.xml
index e96b9e9e8a48a278413b137a2d99f2642f8f132a..bbe7b798216dc8f074828bb7880b02d8c9415baa 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getActionTitleListFromAllActionProvider.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getActionTitleListFromAllActionProvider.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFieldData.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFieldData.xml
index 1b55e7b26516cbec484400be92dcc171af4eb487..d8a9de4985fe00064c0edabbf278ee6868c493b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFieldData.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFieldData.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
index 5656a0302c5410a59632445c052f42ec6e0bb715..6e519d9e6ab4cc48844518836aec182743425e09 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml
index 922477e84e8134f8d153ac78632416eb7cb556ff..ed2c0306891160ad3a12703b50138c8ff9a49791 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml
index 0baa6e3c5efba24aa2f246377d400c7556c5abe7..6a0516ca420d5913d0d3f8b7582452c54b0fb930 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_createReport.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_createReport.xml
index 172c019e1153e8f24730800204c3ed849b221675..a2923b0dcacaf97ee3f7604da97a356f5c4de168 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_createReport.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_createReport.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml
index 0b27f1928688f9ce358848e926cbe0fbd204084d..812724fd1d34a0ffb9bd4cd75556c8b05d5ff17d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getProxyFieldUrl.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getProxyFieldUrl.xml
index ec5bec9be4e29a83a1d2fc9f44c31ba2bf1b3d2d..6492746bacf46809c5eba507431f3f6372ce30f0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getProxyFieldUrl.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getProxyFieldUrl.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml
index ba593399a823bdaf8bb3e0a568e107cdf276cefa..e6d2e1bdabdc54eae2296213d2fbca8199a156b9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml
index abd4ba66d08b72696df2fac8656887a402b122c3..4cd4dc58258df6696dc1d1ac096a5ba6ae4af707 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_modifyFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_modifyFieldList.xml
index 1471ee1b7990ab4c010abfd25c6fce1b9e396ede..7ebe57a0995220213bb583c58fa2e7c695a40e8c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_modifyFieldList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_modifyFieldList.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.xml
index a565527b0705dac9eb35b8665052978770087377..eb2bba616296dbf553bfd25d9303dfda4604992a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog.xml
index fdd2b413a3c894f640630be2d48d86e8249bf131..b8c7a7d14d8b608105b054e2327031319ce132a1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml
index 51e305245342c66740bfb8ac6551389de406944c..f7af44e04f05a0cc7d6f56c76d78bf3fb7adf3d2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/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>
@@ -536,10 +533,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_new_id.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_new_id.xml
index 8ee3c836a722b6a0d7ec6dbf609962382acfdef7..ed544d3c1cffe8c3ea6e238de6b3d2ff1e993b98 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_new_id.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_new_id.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_original_id.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_original_id.xml
index 2741e5c0cc3a7d3b81589b3d64b9a5d247001dfb..0a0ce301afd9d8a7cf971defca52eb207bbb7af3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_original_id.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox_original_id.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml
index 30b45d9e4a0990ef43eff90c543ffd9355517fb6..07e197c32f57e6e4bc885513428560aa8a10866d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_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>
@@ -552,10 +549,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_hidden_field_path.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_hidden_field_path.xml
index 91e6cadb60f761dabfe12d61a24140d8f2231d2f..d731aa40dcd114b33a076401b20492248873a322 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_hidden_field_path.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_hidden_field_path.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_selected.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_selected.xml
index 8c6e73fb80e94d968fb8ba369208cc8e21f47bed..dd435fb08991dc004b505556933fa4da1bbea682 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_selected.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox_selected.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -172,10 +169,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/your_explanation.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/your_explanation.xml
index 82412881d06911b02d502ad3a7749529130c0cec..cd6387c32c40819bf71f6b20effcda08039cef99 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/your_explanation.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/your_explanation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -284,10 +281,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_updateBeforeRenameProxyField.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_updateBeforeRenameProxyField.xml
index c8de9bd6be1a35f36deedb31405f487e3566862d..d57255d95aec7e33fcb87c932d9f406d5e00c530 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_updateBeforeRenameProxyField.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_updateBeforeRenameProxyField.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog.xml
index 09d7c1ffddf05083b3141b16427da34b0170d763..c689197e4db4a15e76fb92695eed671b111207a0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_portal_type.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_portal_type.xml
index fb8837df8f4284b5c003d3d49a8a9eb0a6882f69..f1bdcdc5488f9cf5fc5deb7af9a7d09ba3cd6c35 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_portal_type.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_report_name.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_report_name.xml
index 4d8bd28dfc45c9a16a19d32d9515505eaf13bccc..bc0572500e4bddb960527036d45011067c55911e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_report_name.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_report_name.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_skin_folder.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_skin_folder.xml
index 97309b2b1df93266bdf2e90787ba9a79e3c5f149..a5339b0e436df17ee5632d7677884d964f3e084f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_skin_folder.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_skin_folder.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_use_from_date_at_date.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_use_from_date_at_date.xml
index 0cd68027ddc89ddb68a60f5514e58489df93ad4b..790ff988d382429c334641156313d4349c81f321 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_use_from_date_at_date.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewCreateReportDialog/your_use_from_date_at_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog.xml
index 4ff2a8ab77dea8b81d9f2b1be2fb3d85101b8fb9..e34d59e49e9478addd840227dbfd1f04608c16b6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml
index 0b72094c538f023dc0155a1e3cc0f6c6931d7156..d7ccc92d8254478b132a5f5b2f2e73f3fa55ddf3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/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>
@@ -545,10 +542,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox_choice.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox_choice.xml
index eca8a980afe9265027d4153ea4aa61b293975d3d..0efc975b6dadebe30f335b047e890f5a874931e4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox_choice.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox_choice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiCheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiCheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -250,10 +247,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>
@@ -266,10 +260,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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_getToBeTranslatedMessageListFromEntireSystemAsPot.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_getToBeTranslatedMessageListFromEntireSystemAsPot.xml
index b3b2e122a76efbcc7ff02deead7e6e94ddec6c72..994bb5979492022bc8fe1a8ef23d82031f266848 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_getToBeTranslatedMessageListFromEntireSystemAsPot.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_getToBeTranslatedMessageListFromEntireSystemAsPot.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_setSkinCache.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_setSkinCache.xml
index 7310a0c4ecac430067882ba4eee2cf2a07839cc1..9ca59c82d391f83f99894f91cd9ee2047cdf326d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_setSkinCache.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_setSkinCache.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml
index 31c2d00bf104266baec67c7dd716d914921c4ee2..9d0e690433b5dd4009bcfc5d51a6c1d8e9f295b2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Type_cloneRoleInformation.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Type_cloneRoleInformation.xml
index 4dade13a9e8128f4ecf492b90cd36f775b64b850..e3a83ff1f3c373319bf2c1b0f3f9c9ec739b6710 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Type_cloneRoleInformation.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Type_cloneRoleInformation.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/PdfForm_dumpForms.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/PdfForm_dumpForms.xml
index 4941304b09e6282b8a5955194763222f32d6c45e..5ba4918628a6829c67e5b0fe48268d12ec17f1f0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/PdfForm_dumpForms.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/PdfForm_dumpForms.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDeadProxyFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDeadProxyFieldList.xml
index 67925e09f8253a50578a2ade4dc81baccd2a8ea1..1ecec6a58726febfc39436025ce9a93c729027d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDeadProxyFieldList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDeadProxyFieldList.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getNotAssignedFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getNotAssignedFieldList.xml
index 3f3b1c02da068ae7a131868225a8f624d89ea6eb..84bb87eb1363ac4b09424a2472b2881cdc6c9eb0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getNotAssignedFieldList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getNotAssignedFieldList.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getRelationStringFieldWithoutProxyListBoxIdOrColumns.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getRelationStringFieldWithoutProxyListBoxIdOrColumns.xml
index 21377368d99c5fa367428efbf4ba4fa01fa3c4c8..c726d2bb4d0a606e58edf1937c40b9f6cf8dce0d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getRelationStringFieldWithoutProxyListBoxIdOrColumns.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getRelationStringFieldWithoutProxyListBoxIdOrColumns.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml
index e38e9817675c39bedd535b5334de9473b34ece32..a0f640fcd1884583d7c3b770741bf4514940f934 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.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_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
index 88053aab9295affe9d4b1c75031b82a0b44042c2..352073366ffeb802790beb4edb538ab263632258 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
-        <tuple/>
-      </tuple>
+      <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow.xml
index bc4cc4a9288c3628f8bb48c2baefbb83f334ba93..38bad1c88847b3db6accac64c58c6f1d5014d6ce 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts.xml
index 0622b3c34fa5ffe83ab080066492f760b230dadf..072c8f6540c07806bee17a34c920ec09b2de1bd5 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_buildMessage.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_buildMessage.xml
index 7bcdfbd8801d49f5ddf6adbb93c0593a303f7afd..6a2e3fe49cac3f56fac89934b1be1996df3fee2f 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_buildMessage.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_buildMessage.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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_checkConsistency.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_checkConsistency.xml
index 1faaa960418437e29952ac4f05480a49d07a7bd6..635c18d04fa47ee4bfef3e496c6b816bac2ee817 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_checkConsistency.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_sendNotification.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_sendNotification.xml
index 92144cfe9d3cf88fe04a5a3952f557550f206a76..a60dbcd63c3c4936c9c54d2e8a26178a6c8c337e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_sendNotification.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_sendNotification.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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states.xml
index a21bb6e95907daaaa25a050ce309600283726693..27ec9069024e0f59bf4b612113789f37da98879b 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/cancelled.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/cancelled.xml
index 4014e603f525185f7a1bddcba2226f3afff64c79..628d83c4c3e065f02bef3b42b0dedb23777d907d 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/cancelled.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/cancelled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/deleted.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/deleted.xml
index c957e8076b25c14214cec8664c04262c93e391bc..6659382cfbdbe3cacffb1054a1a6ad00007fcb15 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/deleted.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/delivered.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/delivered.xml
index fc505e230b6f73dccdbb6b63ed031d9856dee926..69928dc9d88a4f53be62ad49bdf42141a785d786 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/delivered.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/delivered.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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/draft.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/draft.xml
index 73c32bae31c87a49b89f9d64c85805ec23124546..3b53ff0f5e82ef809282c6b4687362ea689b8057 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/draft.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -51,10 +48,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/planned.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/planned.xml
index b113148e0f59613a4a6ba706b7d0bde10e9bfc35..c281703ac734d2a7e389f0146d97776380349714 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/planned.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/planned.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -51,10 +48,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/started.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/started.xml
index 6be4a08ed384974dc4d85f69398c129cfbb55211..80b9b8a0f2c99dfc71031f4f2e8d475d2da97141 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/started.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/states/started.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions.xml
index 092a5b48f6f98be184d86f13a78513a159cfd129..aa36144efed916b804f5f80df9452b1e3166bdec 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel.xml
index 73491d075a331451a95ff839a14d11204e1be3bf..289955fef64418a0cafd23379d2a41cd08d21c15 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel_action.xml
index 9c2602dd86db11f3f3458576f3171d5c8dfa74b4..fa0634ea4abf7df15aa4c48da0828fe04c75d4ff 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/cancel_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete.xml
index cf2b452e353c1af86c9bc0b6e8a1007fae319b37..873b6bbfe4dbfdd5277cc0fe24bc5215661cc247 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete_action.xml
index 13cf2b2f709a99caf6f81647475eaf61d78c6383..417001e1888e5d82ff53fe77e280d9315bcd54b1 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver.xml
index 62ad6606cbb42cf3ed4ff9d0d99db304c8380243..8b71054b5922f16d082aee9c1a65cc211f5e3414 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver.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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver_action.xml
index 4c50a1427694fabdf9581dd2f6d002060b3ef599..b16bdd52f81d594edf9e2ea924697f35edf98dde 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/deliver_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan.xml
index b9948f4e77299304605a7d70e01da364d37f15d2..c165313d0c05b87efdcbbce854d4f35a6f88f385 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan_action.xml
index f6257f80706f0a5bbe92906e91aaa89243a31880..70973aef6344a21a36e6cb0ba527fa17e2aab25a 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/plan_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
index fb2c1b4614db791d44fb70d654870ab0b970b8ff..fcb6f303a5470213aa6c78d1371c5e069f5da4f9 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start_action.xml
index 4e804229663b28acaedb9854fcd1c858e74bfed5..6948301e5db15ad40b6f60bf4572a248db06e490 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables.xml
index a067e6fbbe0c9a5db3778dc414d3acdd4ead9200..bb12bef805f190ec50e023368d6ee5c6c990b816 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/action.xml
index b6ab718b6e4f402af30a6c70995f502302ed816e..cf9789beee1801e4043920f14b286afe2b7731b2 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/actor.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/actor.xml
index 63e83eebcc19a8b9a5758a874b745ecc5a3a5a1d..99dc5a1238c7346b9b96a1d2ee7d5d05bf6f14b9 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/actor.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/comment.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/comment.xml
index 0deee79ddde976e81c020178743bcf11de8a077a..37beb5e4f4c511a40ebafa6a978b08cce1002f06 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/comment.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/error_message.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/error_message.xml
index ca8bd983f68e6bf79753e524e850ac0ef7478ef3..535863de2a26221cff2a356674852ea83bcee061 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/error_message.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/history.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/history.xml
index 33a2afbc9a90382af47a82a2ce5fac7bf818679d..44306b76d7460536661dc87f7786d58d071917d2 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/history.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/portal_type.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/portal_type.xml
index d1c833ff189609805194d91d2437a1a2f443af13..318e098ff6e2a7ca5451e5459837ca9dab622f28 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/portal_type.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/time.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/time.xml
index 624cc5038ca76ec0fbfa83f8f97fb1ab6ae09878..5a517524eeccd0eb267d648b8a077e741acc3725 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/time.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists.xml
index 40787ac9e478b55f5da1edb9a18df61d78e1f459..c7242ee1148db07bda32db11056a3ebf57c34632 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_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_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists/01_planned_bug_line_list.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists/01_planned_bug_line_list.xml
index 6519d5a25cfa5ede01d6cb1116b5b94aae89d07b..4979f073fcb7171c1e85c3f5c30e7f066a86e6ea 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists/01_planned_bug_line_list.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/worklists/01_planned_bug_line_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ Base_viewSearchResultList?portal_type=%(portal_type)s&simulation_state=planned&l
   </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>
@@ -72,10 +66,7 @@ Base_viewSearchResultList?portal_type=%(portal_type)s&simulation_state=planned&l
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml
index 1f644a8291cd35b1b7629f762fe176ba7fdbf2f9..81e7397b5f4009c09ba2317375bc85ea02920e97 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml
index 0622b3c34fa5ffe83ab080066492f760b230dadf..072c8f6540c07806bee17a34c920ec09b2de1bd5 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/Bug_sendNotification.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/Bug_sendNotification.xml
index 2059724e2e9fdf508eb9231b102f00816d247515..25f4451eaf9bd0847dfe3058f9f417e2c0141831 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/Bug_sendNotification.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/Bug_sendNotification.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/checkConsistency.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/checkConsistency.xml
index eb9227e3fed626614d9038c4b03c9d9b4cbbc5dc..2594a0498eaf4de4f844bf66c115bfcd93ce507e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/checkConsistency.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml
index 617d3a974db75a0cc878daa7cdb96b4863af88b2..84db163f89077cba247ce3293b539fc6ba195799 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml
index a21bb6e95907daaaa25a050ce309600283726693..27ec9069024e0f59bf4b612113789f37da98879b 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
index 4d6c2049299d4aa49e617bfbd1ced8744d40c5b5..c749eac25d248bc567e1b9b118f7883b5a8f9838 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/confirmed.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/confirmed.xml
index 0e32d6705ad96f9fd94fc43aa18168f08a50c805..423cd0e1097c3182a43d16163a1aae822515e28d 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/confirmed.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/confirmed.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>
@@ -53,10 +50,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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/deleted.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/deleted.xml
index 7f484b60586d1f34808e18651c9d4e786936b568..b3b7d3e89623698fc9992fadc095f00229cc1af5 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/deleted.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/delivered.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/delivered.xml
index 6976daa958931b8c92fced011d5cff8339e7703b..e647d328607abc98d7ba38e7d4aba3c53d11a3f0 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/delivered.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/delivered.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml
index 9402c93f4da662b39306d3c5bd78b783108548a0..ae75fe0de650c288b05c4aa284df9298cddfccf0 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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>
@@ -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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/ready.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/ready.xml
index 997388b43018c717d53964af71305e492077a70c..72078c08be30642ff1e002471ebdaf073a6b6649 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/ready.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/ready.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/stopped.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/stopped.xml
index 977c035ed13c76a1f7ecf1333147e70271aad497..98205e4af0e4dcb163befc6b86ab9593ef6c615b 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/stopped.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/stopped.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -51,10 +48,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml
index 092a5b48f6f98be184d86f13a78513a159cfd129..aa36144efed916b804f5f80df9452b1e3166bdec 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
index 506032ca5c11baf3787a8589dc882dbee770d1ae..b034fb87a6c8f9765f0ec7be27d2702992481a33 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
index 6139c9a075982ab1910e0c923ad721aa3a6d45b6..89e65b7e3d309e76c346a9a4e035dbf4b2f32b24 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,10 +63,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>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -111,10 +102,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm.xml
index a01bd83a5640f66b03c1d5297b99e88837ef94eb..e5835f8686d38e7fc5d4ad2be5535e1b450c47fd 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm_action.xml
index 3ca2e7d02ebf2690389708ff4620a5ac87df0667..890dd16f8f4ebbb42c3ada965099f895fa81b266 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/confirm_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>
@@ -66,10 +63,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>
@@ -89,10 +83,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -114,10 +105,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete.xml
index 0973fedbc701e20729df9cfa3c0238a6cb5f4620..a203d3aed53a84c27a480c915ce88cfbe15de4d6 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete_action.xml
index 5ce980e4af7b0883df729ff4d2b76a335e2a20a0..672f3509800d1d48817928e4398d8ecabb97f5c3 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver.xml
index 152e761672e4acce0a31082a13656e7c25d4dc95..e60b2fc23a46668828ccb6501489c14bdc76e7bf 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver_action.xml
index ff57f978742c1f644400640dc1c1593ce5f16a09..7e0ff55246a4ded5a4d25e51ffc01ca2b0dfb2e6 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/deliver_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>
@@ -66,10 +63,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>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -111,10 +102,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign.xml
index d37e8007f9e2d2a9656fd2816e3e2618ce3b3739..4fc8998fd4c87da1b3a3b00e4da0e7beca29d7b3 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign_action.xml
index 90d603f7ac56a9c87aaaceb817dbe8a152086531..1ae87f2913bc17be328765a2a22e9ad0422d6d76 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/re_assign_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>
@@ -66,10 +63,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>
@@ -87,10 +81,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -112,10 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready.xml
index c975d3b882b792e6b4673aa8fe62bb4ada7a43a9..384e9383176118d778a56f3e35e271085e4efad7 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready_action.xml
index 9c45c0c700c3bfc291bc73e605d60beceb4c40e0..ebc3d26591557ba63dae4bda4aca37a9b25aa344 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/set_ready_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>
@@ -66,10 +63,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>
@@ -87,10 +81,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -112,10 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop.xml
index e0defc1d5e9cb16b224afc70de8eda77e14aef1d..1ca3ab57bf380a0e0470021b03bdc121a3b69dc0 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop_action.xml
index b8e606c78e23b108ce715ac0b1ec5e30da17e21b..7745fef828be31bcbd6f3af47f023f3785e20135 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/stop_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,10 +63,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>
@@ -87,10 +81,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -112,10 +103,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml
index a067e6fbbe0c9a5db3778dc414d3acdd4ead9200..bb12bef805f190ec50e023368d6ee5c6c990b816 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml
index ed306eb6affcbce508caa0746aada06c86eb8272..e00c8713348bce7b6fe4178219a5ec5ae633c413 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
index d2b89d60519ee166ba66cbdd3119f04a3a865692..493f0994f7b3cba6a09ae9691df927ec5eafc050 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml
index 999beb2edb541d979d837dd7cf33360dd5af14c9..73cd2e791368af4a8e45c18b443bdc7ce1044318 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml
index e89715783d8e9aab79e87a4193985b507d114cf8..69512a44bc5967c8c56eb45fa88a452ba0c388be 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml
index d7bca55728c5667dd7e6ba0edfd9b2e7c9480e02..e0fe339d69806e85c8cb3e1022cb1911912fad0e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml
index a874ecc8bb59a4bc6d87c1dd05677fec81834532..521a53aa171520987084020ee19ce4a8d48a40dc 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/send_event.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/send_event.xml
index aee5260dfef5267ed6e84e4986f490d79d262641..9702aec2ab8a02c64f557c68f63c4a19ce7bdcaa 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/send_event.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/send_event.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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml
index 0364a3b135d75a07c7b61e3a106a254f0cfc1c5f..5ae6932d9904ddbf87ab731c4188bdcf279f62ba 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml
index 40787ac9e478b55f5da1edb9a18df61d78e1f459..c7242ee1148db07bda32db11056a3ebf57c34632 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_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_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/1_draft_bug_list.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/1_draft_bug_list.xml
index c5c6e4c6e7080f3ff0e7e98f9593b7ed0104d857..a5b309f5f7559a4c2596b22678c67b4ce3564a67 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/1_draft_bug_list.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/1_draft_bug_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ bug_module?simulation_state=draft&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ bug_module?simulation_state=draft&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/2_assignee_confirmed_bug.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/2_assignee_confirmed_bug.xml
index 02bf4dcba376f0cea59528c8ba13d4bbf9619142..d2c049b121e2448c89e6736fb2ccf2ebda779bfa 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/2_assignee_confirmed_bug.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/2_assignee_confirmed_bug.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ bug_module?simulation_state=confirmed&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ bug_module?simulation_state=confirmed&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/3_assignee_started_bug.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/3_assignee_started_bug.xml
index 27e6d4f453ffbad74171e74798bfb995c3a41f23..b238a2ed08cf7473ab10104c05fd15ae9ce7306a 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/3_assignee_started_bug.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/3_assignee_started_bug.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ bug_module?simulation_state=ready&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ bug_module?simulation_state=ready&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/4_assignor_confirmed_bug.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/4_assignor_confirmed_bug.xml
index 23a0c056e0c11781d225476893c1b2bd3a61d253..ed83820f4797869abfc01137371ffe62f4fe6377 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/4_assignor_confirmed_bug.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/4_assignor_confirmed_bug.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ bug_module?simulation_state:list=confirmed&simulation_state:list=delivered&local
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ bug_module?simulation_state:list=confirmed&simulation_state:list=delivered&local
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/5_assignor_assigned_bug.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/5_assignor_assigned_bug.xml
index 4e1e0ad3ab505ad8b9219775358fdb032b295c24..c35e98740c0b26e7f5f0ee8e91197349b2a9d0ff 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/5_assignor_assigned_bug.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/5_assignor_assigned_bug.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ bug_module?simulation_state=stopped&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ bug_module?simulation_state=stopped&local_roles=%(local_roles)s&reset=1
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 5156988895747eb2ca7584975c2cb3bfa0816719..8ec9b982c486d57276f6301c5d03886c6cac9c0b 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-619
\ No newline at end of file
+622
\ No newline at end of file
diff --git a/bt5/erp5_forge/bt/template_update_business_template_workflow b/bt5/erp5_forge/bt/template_update_business_template_workflow
deleted file mode 100644
index c227083464fb9af8955c90d2924774ee50abb547..0000000000000000000000000000000000000000
--- a/bt5/erp5_forge/bt/template_update_business_template_workflow
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/bt5/erp5_forge/bt/template_update_tool b/bt5/erp5_forge/bt/template_update_tool
deleted file mode 100644
index c227083464fb9af8955c90d2924774ee50abb547..0000000000000000000000000000000000000000
--- a/bt5/erp5_forge/bt/template_update_tool
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file