diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/print_pdf.xml
deleted file mode 100644
index b0419eaa7a9807479b68249d675e5076e7a9d336..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/print_pdf.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/view.xml
index ad3e9d5a6adf489eeb582862e3b26ecb3aeddf47..cd6a334ebb2cf023950f6a1ef8e4ba03710fa976 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/print_pdf.xml
deleted file mode 100644
index b0419eaa7a9807479b68249d675e5076e7a9d336..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/print_pdf.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/view.xml
index 38eae9dd6636bc203a3c3f8cb42395abf91256a9..e7f77f2bc722926e03a22a22039ad736c52bc76b 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document%20Item/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_decision_items_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_decision_items_fast_input.xml
index 1c1f3383d3e08d522377fbad300607774b39eb5a..e722dcc7dbad0105f85481cb84f3198b4a0251a7 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_decision_items_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_decision_items_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_items_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_items_fast_input.xml
index 7f3a1bb507b1c55ab2eac36e0a7fdadab709fe42..3fc9594b27dcbe6cbcffaccdb57fd037baf2bc1f 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_items_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/document_items_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/print_pdf.xml
deleted file mode 100644
index b0419eaa7a9807479b68249d675e5076e7a9d336..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/print_pdf.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view.xml
index 77b15f94537a2b5670f29c27360563c69862f921..43d0a787076698dca3048108e74531731ecc8c13 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view_decision_items.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view_decision_items.xml
index c2d0d1fcaf5a5030114be8129b6b44160be77ae6..c762a05c54a2d24c9fbf5c8ad734bf11703af3cd 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view_decision_items.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Document/view_decision_items.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/print_pdf.xml
deleted file mode 100644
index b0419eaa7a9807479b68249d675e5076e7a9d336..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/print_pdf.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/view.xml
index 8d4450607bfb7fcfebf6f0249a62dd9a2cd7468b..c2d7a905339cb6d65871971ca631ff40beea477e 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/lexicon_items_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/lexicon_items_fast_input.xml
index 224e5f4492335bb91f5e7c40cda201715b06af21..493b77ace8c8b243efe27809e5a8c869712fa893 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/lexicon_items_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/lexicon_items_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/print_pdf.xml
deleted file mode 100644
index b0419eaa7a9807479b68249d675e5076e7a9d336..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/print_pdf.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/view.xml
index 5666d768672100efa553f074a47935b69a442f42..93c3bccf73ca34eab92f97254a3714b1428abb0b 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Lexicon/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/list_ui.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/list_ui.xml
deleted file mode 100644
index 319f5c597081b27487c07ff796fae73cd81025ea..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/list_ui.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Modify UI</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/sort_on.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/sort_on.xml
deleted file mode 100644
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/sort_on.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort_on</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/view.xml
index dbb828bc7b5f2cc987a0ed66984060e343b36c58..333f3723f3a455a6b57a26b452f27b5fa511c4bb 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/documents_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/documents_fast_input.xml
index 3aa2df1e493b040054fb6554bfeee279b587c560..f985cf86fb311256fcc11dc5a0bebc42da5b6ec1 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/documents_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/documents_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/lexicons_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/lexicons_fast_input.xml
index 467d826e8aa8790c3a20a9f2106d2a1c34800311..bdc914bbb2f1f614149daee8b8dcd6aead173270 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/lexicons_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/lexicons_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/list_ui.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/list_ui.xml
deleted file mode 100644
index 319f5c597081b27487c07ff796fae73cd81025ea..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/list_ui.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Modify UI</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/sort_on.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/sort_on.xml
deleted file mode 100644
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/sort_on.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort_on</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view.xml
index f2797936d21f97e1bc9e9c709b93403aab1bfa69..cf6068e3b79162e3af99a3aca071e45e155ab68e 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view_lexicons.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view_lexicons.xml
index 60c0655fd3ece5c9e4061fee7dde6236982146c5..166ea15fbddd11ba4a95d457753160f475bc4d68 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view_lexicons.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Document%20Analysis/view_lexicons.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/view.xml
index 0102f7445112194f5fdb91ebb4012c1a3b34d512..81656e40094a8979a8c4a1f1799cb548a73a08dc 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Actor/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/list_ui.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/list_ui.xml
deleted file mode 100644
index 3f6f17206edff35a0a7b6603237da47b6f5a0b7a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/list_ui.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Modify UI</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/sort_on.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/sort_on.xml
deleted file mode 100644
index e844fa54d39539506d0f80333a2477c2fb170e7c..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/sort_on.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort_on</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/view.xml
index 8966c64cf004d32ad55048c5879d73f441b722ae..53f340c46f608318b328571cadaf411c84c4803d 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/view.xml
index c4c36f33fdb68f7bc530c9000c34a62d67df2c76..cdfbf95a7580216475c40a518dc511551f1aa095 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case%20Step/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actor_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actor_fast_input.xml
index 340bdfea6bd368dd87165dcdcb667b95617baeb2..27c02b1ac8524a7608eb8d60e161ec838da697d0 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actor_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actor_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>actor_fast_input</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actors.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actors.xml
index 584d7b89e6de5aaacd3258d08b0dccb6bf0985f3..6c963e6f46e4537474dc501c29f21fb28ce26c87 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actors.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/actors.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>actors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/instanciate_test_report.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/instanciate_test_report.xml
index 4e216bc5e4c9bf7811993c70f5edbe014b99a7b7..3c6c94fe177286807064a7e5579d5b700046d564 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/instanciate_test_report.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/instanciate_test_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>instanciate_test_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/metadata.xml
deleted file mode 100644
index db21efb9f145295ed9090bdad88dea59d4d2bb49..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage properties</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/print_pdf.xml
deleted file mode 100644
index 49204d9eb5028ff9a804ddcfda82983369008c71..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/step_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/step_fast_input.xml
index 5b582b8945ec7004ad900debb94c605afd7a775e..a5316b21801417ce002fc1cc3f75dae6c56f8ec5 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/step_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/step_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>step_fast_input</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/view.xml
index bdd3d8062fe5d6f1a3a15a8243883342254dad8c..0fe3f0abc351fb0a0dc31119b524c8d51d6b56de 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Case/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/view.xml
index 4ed8455c0b8f50c3ef36da82009a78959ab02033..07adcf3c9922c395408438acaf1724037ee05c28 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Actor/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/list_ui.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/list_ui.xml
deleted file mode 100644
index 3f6f17206edff35a0a7b6603237da47b6f5a0b7a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/list_ui.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Modify UI</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/sort_on.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/sort_on.xml
deleted file mode 100644
index e844fa54d39539506d0f80333a2477c2fb170e7c..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/sort_on.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort_on</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/view.xml
index 40ce9744a5b15a151f62ddccbd2d5f36a24151c4..ebc660338f4259de065c932842bdaf2adf00ef1e 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/view.xml
index 81b1cfb9438ddcbf2acc4ea562e423fbe0dbefb2..3c190db06fd04d36a6331abd694c41b74451299f 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report%20Step/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/actors.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/actors.xml
index 7fd244a6c4737978222177713d9d78c8d92f69ba..87ad3fd3384b50073979a0e951fbf26c311245b1 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/actors.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/actors.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>actors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/metadata.xml
deleted file mode 100644
index db21efb9f145295ed9090bdad88dea59d4d2bb49..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage properties</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/print_pdf.xml
deleted file mode 100644
index 49204d9eb5028ff9a804ddcfda82983369008c71..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/view.xml
index 7457586228a28b7c0ce13e469572c84ca98e6b0e..b15e7e21ea63427c32daa09fb0952dc4c361e85b 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Test%20Report/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/view.xml
index 3c6323fe622db6b7db10b3532fc9e976f6ed6794..61ee80cd32e269d9223cbf276e852b456614e343 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Actor/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/list_ui.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/list_ui.xml
deleted file mode 100644
index 3f6f17206edff35a0a7b6603237da47b6f5a0b7a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/list_ui.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Modify UI</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/sort_on.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/sort_on.xml
deleted file mode 100644
index e844fa54d39539506d0f80333a2477c2fb170e7c..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/sort_on.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort_on</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/use_case_report.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/use_case_report.xml
index e403a7da919295c0f27d1dfcca165f3c3f9095b6..809d5e6821b2e9e289728ef8f8bdc1fe0b3de013 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/use_case_report.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/use_case_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>use_case_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/view.xml
index 7535e2a3b884eb9e8b92c49b611e93d67d84223e..a253a320614390de8564be9e67872385b748538c 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/view.xml
index d0a05ad260f8a981765df85bb310b28cef801f53..ef02d00df25429008af00fbb2385d5cdbf15a752 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario%20Step/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/history.xml
deleted file mode 100644
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/metadata.xml
deleted file mode 100644
index 46642a8bf875362613a898417997b9eef1792218..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/view.xml
index 89c537b41c35f13a376430e7affc8b411d447902..df47a5d78cb8577815c6b7a7750ed8e0934585c6 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case%20Scenario/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actor_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actor_fast_input.xml
index c984eb7e7e199957d54ce625ce4a1bc8663e9897..89771127d7f481fdcfd337eb484258eaa4991ae5 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actor_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actor_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>actor_fast_input</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actors.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actors.xml
index f0de7a1b044a22de21e0144f47013f15d56677dd..7122203a17c8f8dd16a4da63bc3b7567435968ed 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actors.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/actors.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>actors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/history.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/history.xml
deleted file mode 100644
index e2856b9771be8a11756ca9486fab923c74b842fe..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/history.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/metadata.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/metadata.xml
deleted file mode 100644
index 785c1ce15ab0a1ffcfd1f4d61269afb7a90f7fbc..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/print_pdf.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/print_pdf.xml
deleted file mode 100644
index ab97070346d1893fb87e1e1d2a9a7b748db9a201..0000000000000000000000000000000000000000
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/print_pdf.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print_pdf</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/scenarii_fast_input.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/scenarii_fast_input.xml
index 81057bef19f80e52182ade4cea824df730414cfa..290f23837f281c939672418d377973366ff72455 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/scenarii_fast_input.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/scenarii_fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>scenarii_fast_input</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/view.xml b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/view.xml
index 5619999ed06cf99fb92309604fb9be08b6d94507..732bb0ba6005498df223cddb4c0d1356dd388bb4 100644
--- a/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/view.xml
+++ b/bt5/erp5_consulting/ActionTemplateItem/portal_types/Use%20Case/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,10 +41,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -74,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/document_analysis_document_type.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/document_analysis_document_type.xml
index 94451f1f983e525d85732b55448f8412929ca6ce..7081870146894d5f163997875184c2eabcd4a356 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/document_analysis_document_type.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/document_analysis_document_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,36 +16,142 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>document_analysis_document_type</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -56,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_type.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_type.xml
index d3cebdb17ed1ebc012756dd998cbfc946cf0c915..f7a4124f76ff8d3e2be815bfce993107cb9e463e 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_type.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,44 +16,142 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: []</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>lexicon_item_type</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -64,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_ubm.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_ubm.xml
index cf35038d3c1198b907dacc934fd2aa6a9f80d75f..30aa4f5e579918729fac08d60017948206e947b3 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_ubm.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_item_ubm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,44 +16,142 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: []</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>lexicon_item_ubm</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>6</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -64,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_source_type.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_source_type.xml
index 5cd5a66720657bd8e935cec0b8cd9c9a99791a61..b64f2b0a52b9c44f86513f441278b58d8adda98d 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_source_type.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/lexicon_source_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,36 +16,142 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>lexicon_source_type</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -56,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml
index f796c102764a8675754d017c59e96905c3527742..69a1f963102083a8f48b1b19d47691ee741fc298 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,33 +16,37 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,20 +55,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>requirement</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Requirement</string> </value>
@@ -78,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/use_case_actor_role.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/use_case_actor_role.xml
index adcf18bd672058ab52f08e205c141164e81b58fe..c4d7b123d1ea3c68e83f2e83497585a0fd38a7c1 100644
--- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/use_case_actor_role.xml
+++ b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/use_case_actor_role.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,36 +16,142 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>use_case_actor_role</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -56,47 +159,13 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/ModuleTemplateItem/document_analysis_module.xml b/bt5/erp5_consulting/ModuleTemplateItem/document_analysis_module.xml
index 7fdf062aa4929609533c007e6e02d90a0a821b3c..ce1e45a3b82ce43459faef0111a7fb3ef276b6de 100644
--- a/bt5/erp5_consulting/ModuleTemplateItem/document_analysis_module.xml
+++ b/bt5/erp5_consulting/ModuleTemplateItem/document_analysis_module.xml
@@ -228,22 +228,10 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -252,10 +240,6 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -288,10 +272,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -404,10 +384,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -556,6 +532,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +559,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -681,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
diff --git a/bt5/erp5_consulting/ModuleTemplateItem/test_case_module.xml b/bt5/erp5_consulting/ModuleTemplateItem/test_case_module.xml
index 34d36e0416bfd464dafd2c231aba7b6b85a8f949..b31cce1ac37bb6502948925e4f3f8a2139da0c1c 100644
--- a/bt5/erp5_consulting/ModuleTemplateItem/test_case_module.xml
+++ b/bt5/erp5_consulting/ModuleTemplateItem/test_case_module.xml
@@ -228,22 +228,10 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -252,10 +240,6 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -288,10 +272,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -404,10 +384,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -556,6 +532,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +559,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -681,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
diff --git a/bt5/erp5_consulting/ModuleTemplateItem/test_report_module.xml b/bt5/erp5_consulting/ModuleTemplateItem/test_report_module.xml
index 60a0d282d593e460a0a2a901cd85a9b2127a5463..6833b4b5e1a3c031c3f5a812a3094a178a2d2d46 100644
--- a/bt5/erp5_consulting/ModuleTemplateItem/test_report_module.xml
+++ b/bt5/erp5_consulting/ModuleTemplateItem/test_report_module.xml
@@ -228,22 +228,10 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -252,10 +240,6 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -288,10 +272,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -404,10 +384,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -556,6 +532,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +559,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -681,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
diff --git a/bt5/erp5_consulting/ModuleTemplateItem/use_case_module.xml b/bt5/erp5_consulting/ModuleTemplateItem/use_case_module.xml
index 0d264f3d2d1a728b970ddec868800f11743ffddd..376cc3aa4b00c3a39d0f0e31c35dd73929ba6cdd 100644
--- a/bt5/erp5_consulting/ModuleTemplateItem/use_case_module.xml
+++ b/bt5/erp5_consulting/ModuleTemplateItem/use_case_module.xml
@@ -228,22 +228,10 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -252,10 +240,6 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -288,10 +272,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -404,10 +384,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -556,6 +532,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +559,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -681,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
diff --git a/bt5/erp5_consulting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_consulting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 3af138634e2679411e9d91716357e6ff8c3dd070..ec817c3b36de290c0e882d16789bca674f1f3a3f 100644
--- a/bt5/erp5_consulting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_consulting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -1,11 +1,11 @@
 <allowed_content_type_list>
  <portal_type id="Document Analysis">
-  <item>Document Analysis Document</item>
   <item>Document Analysis Lexicon</item>
+  <item>Document Analysis Document</item>
  </portal_type>
  <portal_type id="Document Analysis Document">
-  <item>Document Analysis Document Decision Item</item>
   <item>Document Analysis Document Item</item>
+  <item>Document Analysis Document Decision Item</item>
  </portal_type>
  <portal_type id="Document Analysis Lexicon">
   <item>Document Analysis Lexicon Item</item>
@@ -13,15 +13,6 @@
  <portal_type id="Document Analysis Module">
   <item>Document Analysis</item>
  </portal_type>
- <portal_type id="Feature">
-  <item>Feature</item>
- </portal_type>
- <portal_type id="Feature Document">
-  <item>Feature</item>
- </portal_type>
- <portal_type id="Feature Module">
-  <item>Feature Document</item>
- </portal_type>
  <portal_type id="Test Case">
   <item>Test Case Step</item>
   <item>Image</item>
@@ -32,16 +23,16 @@
  </portal_type>
  <portal_type id="Test Report">
   <item>Test Report Step</item>
-  <item>Image</item>
   <item>Test Report Actor</item>
+  <item>Image</item>
  </portal_type>
  <portal_type id="Test Report Module">
   <item>Test Report</item>
  </portal_type>
  <portal_type id="Use Case">
   <item>Image</item>
-  <item>Use Case Actor</item>
   <item>Use Case Scenario</item>
+  <item>Use Case Actor</item>
  </portal_type>
  <portal_type id="Use Case Module">
   <item>Use Case</item>
diff --git a/bt5/erp5_consulting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_consulting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
index 85dae060817148658be91b2445dc63c1702b5970..da77886a068706ace8565d48ef18d4ddd64376bc 100644
--- a/bt5/erp5_consulting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
+++ b/bt5/erp5_consulting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -2,12 +2,6 @@
  <portal_type id="Document Analysis Lexicon">
   <item>DocumentAnalysisLexicon</item>
  </portal_type>
- <portal_type id="Feature">
-  <item>Folder</item>
-  <item>XMLObject</item>
-  <item>DublinCore</item>
-  <item>Document</item>
- </portal_type>
  <portal_type id="Test Case">
   <item>SortIndex</item>
  </portal_type>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item.xml
index 80d80c7b28f2d8793593b436525c844eead0b8c1..07ef5109e00f4765d815e1283e063c777166b423 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Decision%20Item.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Item.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Item.xml
index 6e39afc6966e110a566b764e35de2a968dc9cf88..c191ecd281314f203b4231d41802eefef8113e04 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Item.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document%20Item.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document.xml
index 228f486cc6cf46b652890fe8ef5f22d444eb17d5..2249d82a7a57da8ee8cafb0e0f6bbffd8d240850 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Document.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item.xml
index 65d48af79c6929f1ef9c69914ff1b1f9f1d4e176..4d4f170aec7fd0525bc3a57b5caf09d3435de7c5 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon%20Item.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon.xml
index 95119421c521e281bb02193cadae2b6138c20190..1e179a46b6e1de0d4fdc64a68750acf20b735cc4 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Lexicon.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Module.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Module.xml
index d7e149743f0d6efea4dab8b663c693b997a77f92..844fdaeaced3741dece5eb102c2d66ded605f3fa 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Module.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis%20Module.xml
@@ -33,6 +33,25 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
@@ -106,4 +125,44 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis.xml
index b3fd7954d2e8bff88c59c06e2a59f9bd06ec9faa..e14c3c5108177e958201ac5b126c38df87312e97 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Document%20Analysis.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Actor.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Actor.xml
index 20d451a6936a1e429c2fba022e6a3405157e09fb..da1453cb63b229d84f067cdc81bb6193e414479d 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Actor.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Step.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Step.xml
index e8f4b21ef700b55ff89255a249ab19a37f11a016..ba01cef8ca9434b8865d2c1171a3a2ac92770176 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Step.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case%20Step.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case.xml
index 51e5ff1d206346208e7014e2ea54be0f67f81410..786eaba6fc465b64865c553302d00deb97109754 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Case.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Actor.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Actor.xml
index 5d81a17b2e4a558726df056704533e54e159fca5..767bb32383d7cae7bfe2462003222cbf20c58e31 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Actor.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Step.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Step.xml
index 7e6d58e82383468017fb8d28129f4dd97bec655b..2308424bbc7bea31d8824710b00cbc1ea5697b47 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Step.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report%20Step.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report.xml
index 455a510912bbbc6756b3776ef99ed2a8ceb85d4b..36fdc7bdec2c61a0005cc708f20b95f1aca0f5ac 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Test%20Report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Actor.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Actor.xml
index d24df869f0c56c836cfe8a0babfd1a6bad41d3fa..4e856716321980dda714ae4adff25981ee72038c 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Actor.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Module.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Module.xml
index bc55161cb74096a4b7f8a802ba02189da3010e47..c1e7046dfd4f5e2168707c340494c1662da64ded 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Module.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Module.xml
@@ -33,6 +33,25 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
@@ -106,4 +125,44 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario%20Step.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario%20Step.xml
index 921278728c5fd124505d65fed2922c23a4209580..8435f94dc3b2cfefc810e8566f2f1a3af4e346ec 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario%20Step.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario%20Step.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario.xml
index 6b3c716c07361b9247f21cdcb7c036c1ad1875e5..ff881af0806836dcd670fa2bc5c1ddb16f471a17 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case%20Scenario.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -36,6 +33,25 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
@@ -111,4 +127,44 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case.xml b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case.xml
index 80de7fbd04e50ec56850afeb253bf03bfdd3c17f..8b97e1d20ea3ca4fcf48214dac7f3c6850372643 100644
--- a/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case.xml
+++ b/bt5/erp5_consulting/PortalTypeTemplateItem/portal_types/Use%20Case.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting.xml
index b1240d6d463e6f3358e7ecbb0edb404134b53048..09f4164177c3a6ef2dc33f2d1acdfa10987fd716 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/BaseConsulting_FieldLibrary.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/BaseConsulting_FieldLibrary.xml
index 2f44e462179827595acf5731b9dbcd1c334ed94f..7ba08b98fc972b5ce77828d0adf366e86ea77609 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/BaseConsulting_FieldLibrary.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/BaseConsulting_FieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItem%20_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItem%20_view.xml
index 616148eb8f70f1933a840b4c20ded77b738de874..f7f3b50459c51bec5c9bdc9a72e582d069f5569c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItem%20_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItem%20_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,13 +76,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -93,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -102,7 +99,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput.xml
index cbf308a0733dcfeea4b2f11a0360fe3cabd0b848..4eed2e67254b4b438dfab7b026bb08ceacc60013 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_item_description</string>
@@ -103,13 +100,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItem_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItem_view.xml
index a9ec834b52e7166adf8d56c2b266c13967557477..c1b07c7d1eaf2e49347e4b50f1a3155f00a82c95 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItem_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItem_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,13 +76,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -93,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -102,7 +99,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput.xml
index 3098c33de02ec7cf94cac8e0eb3aea524faa4661..b8ed8869d8b48ad6c3522d94463bfaa9ca941e0d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_item_description</string>
@@ -103,13 +100,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems.xml
index fc5eaa8d08f11ab2eb6586efa5f4a2111acb44ef..8469c9c58e9becbc75e053a23ab11f9936322e72 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -105,7 +102,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -114,7 +111,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_document_analysis_document_type</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems/my_description.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems/my_description.xml
index cb778c46f1ce4ec9e3718a6540e160d517429cab..c1accd72fef4344563926727c78151e29a16ec07 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems/my_description.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewDecisionItems/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems.xml
index f455f38cd2762315759cd8f8fbff9d8a1702131c..624c37380f4a9871e42b0705a7541768d7e607ab 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -105,7 +102,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -114,7 +111,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_document_analysis_document_type</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems/my_description.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems/my_description.xml
index cb778c46f1ce4ec9e3718a6540e160d517429cab..c1accd72fef4344563926727c78151e29a16ec07 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems/my_description.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocument_viewItems/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput.xml
index 0f3adb1e3393c2b5a14eaa29401c43732f55f495..f9e6b513a4a3f72ad1399b4e5e3b0413c11adb60 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_document_title</string>
@@ -105,13 +102,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest.xml
index 0a0d7956a49af80780bea815dc1fbe46dd6510b5..15ea885c32855ed790bb115b850e37fbdec3bc5a 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_document_title</string>
@@ -105,13 +102,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view.xml
index 7e5eddda81e9c145465832513275566b66f010b4..f7a9f7acfc0257eebfb94f35e88c82b9e3982167 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,13 +76,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -93,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -104,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_item_class</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_class.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_class.xml
index 21f5a92e6630fc334b081baf432ff917a7b40543..beeae9c2a986a462feaf8556a0839e55804fedc7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_class.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_class.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_property_sheet_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_property_sheet_list.xml
index 415a46b77c955254932335b127017cd3e2c14955..4eda9d4e59998ecd0e20fc9cdf1323af51663b3a 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_property_sheet_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItem_view/my_item_property_sheet_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput.xml
index 9e9accd31dfe93a0af0e5c18075005fbd549dbee..90ef812e3f77529ca09181a56a1c965687dd3b56 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_item_description</string>
@@ -107,13 +104,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_class.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_class.xml
index cba851587aa6f1874169dcc035c2c94dee4aead5..5f17d89e3a2c9a40933730a1ffd4b84d0540f286 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_class.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_class.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_propertysheet.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_propertysheet.xml
index 1e4531044214ca164debc97b0ffd98cb494aa346..f395c92952af65a62f28498c51e13978b4e12c3c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_propertysheet.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox_propertysheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view.xml
index 4db1e2df954a49efcb27b22b8f7b5d63e4869c0e..d47894a3c4c86ba9fcf14c7dcfade196ca58f8b2 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -109,7 +106,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -118,7 +115,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_lexicon_source_type</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_class.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_class.xml
index 65e8c74a9c8bb843e90d57713ad0bc7e1e66a3b7..6145a485d555bfcad19a403540a805081fcda211 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_class.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_class.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_property_sheet_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_property_sheet_list.xml
index d7f461ebdd339dbd4dd9efd8696c61dd6e6e2381..fad17165a23002d4bf18dcfc6a16460ff8090475 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_property_sheet_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicon_view/listbox_item_property_sheet_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput.xml
index 8ede8d7c4e41b6202deafe4a3d9178462252c1c2..c1c5be163d9f14d180c3061288df3d96a52e98ac 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_item_description</string>
@@ -109,13 +106,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_class.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_class.xml
index cba851587aa6f1874169dcc035c2c94dee4aead5..5f17d89e3a2c9a40933730a1ffd4b84d0540f286 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_class.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_class.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_propertysheet.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_propertysheet.xml
index 0cb7c71ef2b96bed55038bd41f0abf38f054ae8b..975f661b55040eee1e560ea84279a752cc53c94f 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_propertysheet.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox_propertysheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList.xml
index dbc023ecd27c3a9aef3a5f033bba26720f81e128..0c271cce07f314514a70ef5ef0ef16622b685260 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -77,7 +74,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -85,7 +82,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_lexicon_count</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_document_count.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_document_count.xml
index 83fc1c916e6d05971908b97cb6e5e8b5be16553b..91a673b87e9a93b1ae759a3cadee789365887a15 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_document_count.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_document_count.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_lexicon_count.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_lexicon_count.xml
index c40973016df12f7f1d60a2366a3fbb8fbebf614a..6fea5ecb5aa755b9c29c6ceaf14aee44881c5330 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_lexicon_count.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisModule_viewDocumentAnalysisList/listbox_lexicon_count.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentDecisionItems.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentDecisionItems.xml
index c06cd7e9c7086122fa3943f19c94277690ed951f..fc32237f8314baefa61f9e945c75717860891a8d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentDecisionItems.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentDecisionItems.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -107,7 +104,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_stat
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentDecisionItems</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentItems.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentItems.xml
index 029c982262f71857a8c028684fd05995a32dd065..416dddccc9c47c7a1135264d66cc29b0ba737b05 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentItems.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentItems.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -107,7 +104,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_stat
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentItems</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocuments.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocuments.xml
index 7473f41b2599fa8eac99421fbe24288181cc2ad7..a1a80e04c7741345c6ea2eced5f015ab12e3d8a5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocuments.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocuments.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -107,7 +104,9 @@ context.FastInput_generateTwoLevelObjectStructure( transformation_rules = fast_i
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocuments</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentsTests.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentsTests.xml
index 9bd5dab6672f08e73bd21165241a8b4e1c8515b3..4e0fe6fe0adefb923e1a74a2ee495f8f6d6f7d8c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentsTests.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentsTests.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -111,7 +108,9 @@ return context.FastInput_generateObjectStructure( transformation_rules = fast_in
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisDocumentsTests</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexiconItems.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexiconItems.xml
index ca392197d2c1ddb1a4a1d4cbda4c28a24240eb71..08cab121fffeb70054d7ee75edde8e8fec756cea 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexiconItems.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexiconItems.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -115,7 +112,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_stat
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexiconItems</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexicons.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexicons.xml
index 69fad4c5ad7f036bb5d1a5c7a58a32c4ebcd35d3..bec556a3b3160a54b1ca1117d36575a671e7359d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexicons.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexicons.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -119,7 +116,9 @@ context.FastInput_generateTwoLevelObjectStructure( transformation_rules = fast_i
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/DocumentAnalysis_generateDocumentAnalysisLexicons</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments.xml
index 018bd7f1432a2aba0bd773190d0e945cff171ac9..36f43856bffe6e248357ca7f06211658fe2d2034 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -108,7 +105,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -117,7 +114,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_decision_item_count.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_decision_item_count.xml
index 6f4ea6340243738cb50221a503ebdff327f8689a..9c176ce02545e14fd9d8c44e4aef2e0116b063d0 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_decision_item_count.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_decision_item_count.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_document_item_count.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_document_item_count.xml
index 8f05d992f77da70d2147b107562a9233441e9a47..fb9571e56046c4498ace7f326087b4139a45f9c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_document_item_count.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewDocuments/listbox_document_item_count.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons.xml
index 4880e5d2ff4881e5c9881c5afbedd16069a6ac8c..208df3b2fe46f7a44c963af4fcc107cb0713ea2d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -107,7 +104,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_id</string>
@@ -116,7 +113,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/listbox_lexicon_item_count.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/listbox_lexicon_item_count.xml
index 220e0ddc964888157447b56556b2f8688825460f..910409a9ce74179c2b0ea3f11869d3dbc6e8df98 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/listbox_lexicon_item_count.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/listbox_lexicon_item_count.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/my_description.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/my_description.xml
index 913da33dd1ae978b8c0153602cacaa29287fb2a1..28738ed8ecb1a8187de0c6d3d07bafd307746139 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/my_description.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysis_viewLexicons/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/ERP5Consulting_getActorItemList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/ERP5Consulting_getActorItemList.xml
index daf30aff52dc3cde9921dc11e5e629985fc1f871..45e6c013d74c6ffb5db538887101fa7e81bc8e54 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/ERP5Consulting_getActorItemList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/ERP5Consulting_getActorItemList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -111,7 +108,9 @@ return item_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/ERP5Consulting_getActorItemList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateObjectStructure.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateObjectStructure.xml
index 3dd3f9d87f1bf32a6e64e92e1a1f8a1aead7d720..306a08834d0bf98617582ae8583fec12e0d45af7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateObjectStructure.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateObjectStructure.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -350,7 +347,9 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/FastInput_generateObjectStructure</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -417,6 +416,7 @@ return printed\n
                             <string>line_levels</string>
                             <string>level_depth</string>
                             <string>required_level</string>
+                            <string>_inplacevar_</string>
                             <string>None</string>
                             <string>valid_level</string>
                             <string>field_to_test</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateTwoLevelObjectStructure.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateTwoLevelObjectStructure.xml
index 2e565fed7d671b53103a721b83b24566faba8f41..9f783ff5d073c8985d93a09efdfce0e1c3b9f4be 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateTwoLevelObjectStructure.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_generateTwoLevelObjectStructure.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -179,7 +176,9 @@ return context.REQUEST.RESPONSE.redirect(destination.absolute_url() + \'?portal_
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/FastInput_generateTwoLevelObjectStructure</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -254,6 +253,7 @@ return context.REQUEST.RESPONSE.redirect(destination.absolute_url() + \'?portal_
                             <string>property_title</string>
                             <string>second_level_id</string>
                             <string>second_level</string>
+                            <string>_inplacevar_</string>
                             <string>new_2nd_level_obj</string>
                             <string>context</string>
                           </tuple>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml
index 9cbfe4c2f3f66b9bdeef7b56ff9c20f8eaa20bff..9fd9ce7de98500be8bb9f954f545cf6116d7a503 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -104,7 +101,9 @@ return l\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/FastInput_initialize</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseActor_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseActor_view.xml
index c76976e9d8c62a473c73fd731b6e002f40dfa56d..925e32407ad6d5d8eb86f906286748773f58cd56 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseActor_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseActor_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseModule_viewTestCaseList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseModule_viewTestCaseList.xml
index cbeb60ee00a18bda8121f0c4dd0fb4fd15ea6122..230bd1bac25cc6fb6f9e6e768e2d767ecacd106e 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseModule_viewTestCaseList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseModule_viewTestCaseList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseStep_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseStep_view.xml
index 94d1999626d3f7e32b5dcb869ab73fbf9fc01314..08a405713dc8f5fe503825c4a39084fb2f486c0f 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseStep_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCaseStep_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseActorList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseActorList.xml
index a10cc820d92e2f3ad4f0dc3d69de34a249e3f01b..04a09f6f256c397c5120d05aee4db54095982298 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseActorList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseActorList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -123,7 +120,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/TestCase_vi
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/TestCase_generateTestCaseActorList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -176,6 +175,7 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/TestCase_vi
                             <string>line_id</string>
                             <string>item</string>
                             <string>_write_</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseStepList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseStepList.xml
index e6ef39ffa5e3f2b8f019ae5117ea7e78622f5868..5aa8bb11c3633c63a60fa3f9233366c4e79786ff 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseStepList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_generateTestCaseStepList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -121,7 +118,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/TestCase_vi
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/TestCase_generateTestCaseStepList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -174,6 +173,7 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/TestCase_vi
                             <string>line_id</string>
                             <string>item</string>
                             <string>_write_</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_instanciateTestReport.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_instanciateTestReport.xml
index edd236d188ffd002323b1c44d3a0254695d85898..a68849b0baca345fba7855101e4caa890997d3d0 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_instanciateTestReport.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_instanciateTestReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -109,7 +106,9 @@ return context.REQUEST.RESPONSE.redirect("%s?portal_status_message=Test+Report+C
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/TestCase_instanciateTestReport</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog.xml
index b1ddac031bbbac21842ad77ee76ecc963c93ebb0..c923e6c789c23610d49b7f9a2dac0c424e35c759 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog.xml
index 8182e1db343131b9d8f93fccf59b039d115ae080..dc184ceab182a235ba6d82d70a30dc4114a293f3 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseActorList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseActorList.xml
index 87d87b485746a59f8a0552e8b30ea639a2777d15..28fb94daaa8784733b131e7f0400eb6b3820dfd7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseActorList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseActorList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseStepList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseStepList.xml
index 07422ad06dbf3e0b45445a6d819082226cf94b00..2dd72d55b9ffc4254c666d39572c0dd5591a9c71 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseStepList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewTestCaseStepList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportActor_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportActor_view.xml
index c0d75a0ec9c72173cf4b1619d81eb5ef4a76a89d..771c503f292a6ba8f2bb515c0ce602dc7636f29e 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportActor_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportActor_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportModule_viewTestReportList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportModule_viewTestReportList.xml
index 32afb1e0e796a43e351853e5b9deb2afaab6e9eb..0bb69e91b75de2c4d0b51c221c0de2d15f4f354e 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportModule_viewTestReportList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportModule_viewTestReportList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportStep_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportStep_view.xml
index 9a771a2eddb9ba2b451fcdbc5ca07381155abcfd..18f3096a0aa0da23c2e62483a701e9076e13bba8 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportStep_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReportStep_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_view.xml
index c0e89f713a2e37d97181e5a85bc04b9337474187..864eb079c83d36f7cb5427803fa037f05c6420d8 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportActorList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportActorList.xml
index c2856c66a31097902a3b34dd491c71b42ea10116..fb2088609e2651f4c2b55c4cc836fe674a64d10f 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportActorList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportActorList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportStepList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportStepList.xml
index eca9b773eaa31f918d5e27c689fc780f0bbf81e4..c9cf9ab61350bd2025914b6d96817dad4345a2f4 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportStepList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestReport_viewTestReportStepList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view.xml
index c1de0c3c168aa58745fca51d02f5168c47be3da2..d60350e71454bfdfdbe69851875256d7ba3be2ac 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,13 +76,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -93,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_int_index</string>
@@ -104,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_use_case_actor_role_list</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_int_index.xml
index f1d4820154b211a03e06bcd7950b6e53379aa1fc..29fdc0b46fd17a57444a807fe7bf3b29035fe1c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_use_case_actor_role_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_use_case_actor_role_list.xml
index e82d9c4fb15954424e39746353f28c1d41051634..d9dadc0e2d8e5adb434c90e3d49984517c9052ca 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_use_case_actor_role_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseActor_view/my_use_case_actor_role_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>MultiListField</string>
-        </tuple>
-        <none/>
+        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_UseCaseReportStyleSheet.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_UseCaseReportStyleSheet.xml
index a2cab4142a37bbf46790f0b9a9bc4b57b21735c4..744dfc4ceac560d26968701ae3a0e2cffa5097e3 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_UseCaseReportStyleSheet.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_UseCaseReportStyleSheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList.xml
index ad987b1a1dc4f5d13900c79fa8094a6f4c72ecd2..0c6798d1270c4bd089bfe1575889915fdc6e3bbd 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList/listbox.xml
index 8ed25c8ce6fa76437d974003802a0b82f9935113..dc2797e182ac70c4074d817266324fdbea2463ee 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportAsSxw.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportAsSxw.xml
index 49f0d8ee188591d9cb901976c665fb5374ff0df0..f127d2ef5921b620a2ab230632b2bd1dad9b350d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportAsSxw.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportAsSxw.xml
@@ -3,15 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>OLE_documents_zipstring</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>__ac_local_roles__</string> </key>
             <value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportDialog.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportDialog.xml
index a39120b844d6abc7eb4be2d64f246a3c746cc966..bc35cb41362f7fdc05bb8b9327651e2d068f5de9 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportDialog.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseModule_viewUseCaseReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,7 +67,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Default</string> </key>
+                    <key> <string>Default</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view.xml
index eae8340fc3bebe9e8fb924f436f581ce59ea1ac5..1b5bbb73302deb988b8958d366b438d7bff852a7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,13 +76,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -93,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_int_index</string>
@@ -103,7 +100,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_requirement_title_list</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_int_index.xml
index f1d4820154b211a03e06bcd7950b6e53379aa1fc..29fdc0b46fd17a57444a807fe7bf3b29035fe1c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_requirement_title_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_requirement_title_list.xml
index 40ef248c0fc5ed26498ec84a7d479ae3ea3d1bd4..78041e211ad76b2c011117222ec7e76c67a748de 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_requirement_title_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_requirement_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_source_section.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_source_section.xml
index d7cfe7c29cf154a57b39bdfb5b3ea2b1e9aa45d0..a1804a3476facd426e412fda8edceab87c20c8ae 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_source_section.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenarioStep_view/my_source_section.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view.xml
index b2a2eca70ed357baca10dd163077fa3423f66d93..c568546e3787323d209de20df3de35b6e99e5228 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -107,7 +104,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_int_index</string>
@@ -116,7 +113,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_requirement_title_list</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox.xml
index 5d8c5a19a2fca20534b2b3fbfd81a6499ad42b45..16722b1506b49534b513596f8a9ff5d475797d7d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -345,14 +342,14 @@
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
-                        <tuple>
-                          <string>description</string>
-                          <string>Description</string>
-                        </tuple>
                         <tuple>
                           <string>source_section</string>
                           <string>Actor</string>
                         </tuple>
+                        <tuple>
+                          <string>description</string>
+                          <string>Description</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -473,6 +470,10 @@
                     <key> <string>not_viewable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -582,11 +583,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_int_index.xml
index bfd86497733f78972627f66eafd743c5d1907824..370d6dad5e135659359ed3705b546aaeacacaba6 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_source_section.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_source_section.xml
index 5a8357b9831a8c1c23c1ef83c153c51dc98344dd..b7bcf1c377fe4db597af63f47330b67b1c00f0c7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_source_section.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_source_section.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_title.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_title.xml
index e6c672818fa8852e93dc993be905948d83dcd4f9..8f8841ce8979671e3d0a843f56f8a85f0e6f0781 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_title.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/listbox_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -211,7 +208,7 @@
                 </item>
                 <item>
                     <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
+                    <value> <int>40</int> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_int_index.xml
index f1d4820154b211a03e06bcd7950b6e53379aa1fc..29fdc0b46fd17a57444a807fe7bf3b29035fe1c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_requirement_title_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_requirement_title_list.xml
index 40ef248c0fc5ed26498ec84a7d479ae3ea3d1bd4..78041e211ad76b2c011117222ec7e76c67a748de 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_requirement_title_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCaseScenario_view/my_requirement_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseActorList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseActorList.xml
index 96a5ab433d19a032db9ce495a4fb0012eea9605e..f54bb57b00bc1080f20b277a3c224e26b75f3390 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseActorList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseActorList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -123,7 +120,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/UseCase_vie
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/UseCase_generateUseCaseActorList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -176,6 +175,7 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/UseCase_vie
                             <string>line_id</string>
                             <string>item</string>
                             <string>_write_</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseScenarioList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseScenarioList.xml
index b6df903e77724547b07f6ae7418cdd66c28130a3..cffb0c076fe78655bce8179ce0d5e51e18ce4f6e 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseScenarioList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_generateUseCaseScenarioList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -166,7 +163,9 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/view?portal
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_consulting/UseCase_generateUseCaseScenarioList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -232,6 +231,7 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/view?portal
                             <string>int_index</string>
                             <string>key</string>
                             <string>new_1st_level_obj</string>
+                            <string>_inplacevar_</string>
                             <string>second_level_int_index</string>
                             <string>second_level</string>
                             <string>new_2nd_level_obj</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog.xml
index cac4299368f89bf3570a0fa442e4f97b411920a1..de362bfb23fa1995fd0ab8da65439d540733313d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -106,13 +103,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox_role.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox_role.xml
index 921c1e3fd16506657d86cd6e4f34569b241ed6b7..f18b2a30043cb321fcc700ec2ebaa189f879658f 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox_role.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox_role.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>MultiListField</string>
-        </tuple>
-        <none/>
+        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog.xml
index 650301463481d2e2638d26f666ac4d98ec7b8711..b3c2bb40ee69f628cc8c6f952192a0156cebc3f3 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,13 +85,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_step_description</string>
@@ -105,13 +102,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList.xml
index 905875ab499f6234a7943dc568d804319972e8ad..f223341cf37f58d13a86d4bf67589f48aefbb36c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_title</string>
@@ -107,7 +104,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_int_index</string>
@@ -118,7 +115,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_requirement_title_list</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_int_index.xml
index bfd86497733f78972627f66eafd743c5d1907824..370d6dad5e135659359ed3705b546aaeacacaba6 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_use_case_actor_role_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_use_case_actor_role_list.xml
index 30aedda9874f5f529c68654bba9750ac8f428ee6..a28c07beff66bed5c57e657277380417becc2527 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_use_case_actor_role_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/listbox_use_case_actor_role_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>MultiListField</string>
-        </tuple>
-        <none/>
+        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_int_index.xml
index f1d4820154b211a03e06bcd7950b6e53379aa1fc..29fdc0b46fd17a57444a807fe7bf3b29035fe1c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_requirement_title_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_requirement_title_list.xml
index 40ef248c0fc5ed26498ec84a7d479ae3ea3d1bd4..78041e211ad76b2c011117222ec7e76c67a748de 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_requirement_title_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_requirement_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_translated_validation_state_title.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_translated_validation_state_title.xml
index 2d7d2549ecf8a2917099b029811661517427600d..6d3db98f578abc278055d4aa6cb16ee56c4fa86c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_translated_validation_state_title.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseActorList/my_translated_validation_state_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList.xml
index 6a218a028d8d51693c9d884ec262447f9095f63c..dbb52cd62f463b62046bd5e0b79b74122f686ea1 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_description</string>
@@ -106,7 +103,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_int_index</string>
@@ -115,7 +112,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_requirement_title_list</string>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_description.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_description.xml
index 15077bcc5e8eb13abdf441c0a57ad11de487df87..e70b55e801825f42da80f8de79e926774e499f11 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_description.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -275,7 +272,7 @@
                 </item>
                 <item>
                     <key> <string>width</string> </key>
-                    <value> <int>40</int> </value>
+                    <value> <int>60</int> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_int_index.xml
index bfd86497733f78972627f66eafd743c5d1907824..370d6dad5e135659359ed3705b546aaeacacaba6 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_title.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_title.xml
index e6c672818fa8852e93dc993be905948d83dcd4f9..8f8841ce8979671e3d0a843f56f8a85f0e6f0781 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_title.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/listbox_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -211,7 +208,7 @@
                 </item>
                 <item>
                     <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
+                    <value> <int>40</int> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_int_index.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_int_index.xml
index f1d4820154b211a03e06bcd7950b6e53379aa1fc..29fdc0b46fd17a57444a807fe7bf3b29035fe1c5 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_int_index.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_int_index.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_requirement_title_list.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_requirement_title_list.xml
index 40ef248c0fc5ed26498ec84a7d479ae3ea3d1bd4..78041e211ad76b2c011117222ec7e76c67a748de 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_requirement_title_list.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_requirement_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_title.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_title.xml
index 2e022ed3d96151c933792dd49533a5c6dd38a394..6b82ce9ff254a0f838fcd98a53be0e0ebfbd6a96 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_title.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_translated_validation_state_title.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_translated_validation_state_title.xml
index 2d7d2549ecf8a2917099b029811661517427600d..6d3db98f578abc278055d4aa6cb16ee56c4fa86c 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_translated_validation_state_title.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewUseCaseScenarioList/my_translated_validation_state_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow.xml
index e1e1ac0bf8d9610cb85da1184a0078d80dc225d1..9aeea6608575ff3bef8bfacfe3ab28794196ce04 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/scripts.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/scripts.xml
index 164112bd0b41f788894edab7dbbebf931a618214..921bda930db428a75811ecee6501024d4f68ebd9 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/scripts.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states.xml
index 9653d814da20a701a5e9f1a05754d33743dab98c..ddb880987e566fb491155526af3ed27dbd2e12a7 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/failed.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/failed.xml
index 05db2cda880e46b1e2990cf1025072c799363d20..232b1699720ed429029fb5ec574b22814a56971c 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/failed.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/failed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/succeeded.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/succeeded.xml
index 26b68bc6a2ba6505d5aa8ccef0ca25cf363143d9..b84a9dbbfe4bc8b2aa396f46b3e548c77483aeed 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/succeeded.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/succeeded.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/todo.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/todo.xml
index 832c42a15352b566279720010ad678002d63d7f1..d682e0d7a51472e85a833a1c4f1bef1c261b9e27 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/todo.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/states/todo.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions.xml
index eec7ba7928f9db635db75d2d90bdbeeed6e5be55..eb34805c27a6fcb956f11553d6f94001e406b6c2 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail.xml
index 6b47aa3475af9b1c05a7ae19f692a201d0f2ac71..9010582cd4e46f39917709c2755ac08a8a4497d5 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail_action.xml
index 56e28b030cde554de1e13ade6bc991ea888c4f24..7ffea43113466d4e4cc000edf68eadaecfe1256e 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/fail_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed.xml
index 29c18544dfbe5ba2dd7b97d7451c6fee1347ec4c..e93478bcb6547c184e4cfa24b0e8662193243ccc 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed_action.xml
index e6f654b67aca57eba6748eb53c96707b02f44133..35daee759dab9f15fc9bc933994a9b169d6d63ca 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/transitions/succeed_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables.xml
index d36f9e73c8fa005ab1ca08bbee170225e2e30065..b436e9ccb1c627d6503364b8cad737a038a88443 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/action.xml
index e2d54b25d769b04e37fad3417d218ec035470e50..259c80afcf7f5b8cfa6e6c1352e83522f5961a8d 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml
index b81346a188e9d410bdc524bf29d71c14b6e862de..d61e0797ec015931e368116fdb67b856e4d98f32 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/comment.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/comment.xml
index 05ac72139e772a6566353292fdf25ffd7870648f..17628b77ae5aea3f45743d9ee0bcde2a8b4872fb 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/comment.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/history.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/history.xml
index 2a212275cf48864d8ac38320bcbe37629c8b1ff3..67134b997c7d876d50c99d06c5f1d80c87c20bad 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/history.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/time.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/time.xml
index a3891299981e44f43071c0030f1069bcaa2edf33..60befb96fac5fc1e4dd6ed94c691e37bdfec6386 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/time.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/worklists.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/worklists.xml
index 055366cf24001b4dc67bce9e07d59b30ed034f02..13d4865218a5b8382537b280f330de9c1b8f4645 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/worklists.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow.xml
index b3fee3123fa2288e27de27f276f105747dd0f2ef..1b5c654d0c1f2d5f380c925af54b5b233051b7f0 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/scripts.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/scripts.xml
index 164112bd0b41f788894edab7dbbebf931a618214..921bda930db428a75811ecee6501024d4f68ebd9 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/scripts.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states.xml
index 9653d814da20a701a5e9f1a05754d33743dab98c..ddb880987e566fb491155526af3ed27dbd2e12a7 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/canceled.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/canceled.xml
index d7c4517ad06c121f69b328cd53d9e19d85c4c387..de8ba7968ff46fa142edfe204c5643a2193176e3 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/canceled.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/canceled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/confirmed.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/confirmed.xml
index c99834443f02ee61e395183c14c1ae270991d5bd..9bfafdabd217ddead8252e9f2f1f9b6bf70fa69d 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/confirmed.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/draft.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/draft.xml
index aafeadf2373692c53ee69ec2a2b937ea956fdf57..29844fda70730ca053f3aee46ef5fa4540261170 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/draft.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/failed.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/failed.xml
index 1d3c03a32c93cda0fe253b6074d1e07156121227..f9d3f8bca6653b4c533838f384b7010aa1f4c478 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/failed.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/failed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/started.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/started.xml
index 283ca84de86f1029a9c051a61a52a5c9424cee20..5c8d5a8e00510fcdd9afc93658d9a3c8d7253cbb 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/started.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/started.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/succeeded.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/succeeded.xml
index 59fd406e7d73b0efec8e080e523790e16718f28a..c2cba6ef061f292c1507c0e9d498c93f34ca90b9 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/succeeded.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/states/succeeded.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions.xml
index eec7ba7928f9db635db75d2d90bdbeeed6e5be55..eb34805c27a6fcb956f11553d6f94001e406b6c2 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel.xml
index 1c287fdb7438701c7d6033484ef39278efaf843d..553252503cfac907bef9049600719ccb330a9b45 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel_action.xml
index 2dcf2c5477018763c2019eb8c6bc599bcd940fd3..d9d98ec694608ed0d8b078e27c1252858f31c7c5 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail.xml
index 6b47aa3475af9b1c05a7ae19f692a201d0f2ac71..9010582cd4e46f39917709c2755ac08a8a4497d5 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail_action.xml
index 7601607f97bd86800a0f34162e2522d902a0855d..cbcf365c5d38913ca8cd71b6d310b4d3119a0175 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/fail_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start.xml
index 0a789f067ee1c16bd780d813688660e563dff76a..a934122ea9e551ed607bdb40b8e56ba5e0018713 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start_action.xml
index a83fd79621ed34ac26452962250df44882228113..c5c7ba305708fdddfcc9597297ef0efb36f97015 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/start_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed.xml
index 9ea292f46909d9d085f756c976f1ec5b5bb44e45..40956eaddf3bc7b6858152025f8560224fd45297 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed_action.xml
index acfa8103c5525bd2d43e7dfddac1660859c88a7d..33517d26c7fbc0a941be4f59808b5632ebaadac8 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/succeed_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate.xml
index 7f72b87dd3d4bab22e18cf3e734ae81c8cb36636..0fee333015884f8f668c675f7d282c9205fda266 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate_action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate_action.xml
index deaaf8529725c5ec8f746df73b754f6b608d8837..1950df2ddb47982f730e448a9329cf7418da087f 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/transitions/validate_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables.xml
index d36f9e73c8fa005ab1ca08bbee170225e2e30065..b436e9ccb1c627d6503364b8cad737a038a88443 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/action.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/action.xml
index e2d54b25d769b04e37fad3417d218ec035470e50..259c80afcf7f5b8cfa6e6c1352e83522f5961a8d 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/action.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml
index b81346a188e9d410bdc524bf29d71c14b6e862de..d61e0797ec015931e368116fdb67b856e4d98f32 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/comment.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/comment.xml
index 05ac72139e772a6566353292fdf25ffd7870648f..17628b77ae5aea3f45743d9ee0bcde2a8b4872fb 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/comment.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/history.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/history.xml
index 2a212275cf48864d8ac38320bcbe37629c8b1ff3..67134b997c7d876d50c99d06c5f1d80c87c20bad 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/history.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/time.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/time.xml
index a3891299981e44f43071c0030f1069bcaa2edf33..60befb96fac5fc1e4dd6ed94c691e37bdfec6386 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/time.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/worklists.xml b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/worklists.xml
index 055366cf24001b4dc67bce9e07d59b30ed034f02..13d4865218a5b8382537b280f330de9c1b8f4645 100644
--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/worklists.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_consulting/bt/revision b/bt5/erp5_consulting/bt/revision
index 3cacc0b93c9c9c03a72da624ca28a09ba5c1336f..ca7bf83ac53a27a2a914bed25e1a07478dd8ef47 100644
--- a/bt5/erp5_consulting/bt/revision
+++ b/bt5/erp5_consulting/bt/revision
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file
diff --git a/bt5/erp5_consulting/bt/template_action_path_list b/bt5/erp5_consulting/bt/template_action_path_list
index 11a47678d77bfe232d1f923a9646383602872435..7e584d2a9f1a0e910a91f13039620c9537ec908e 100644
--- a/bt5/erp5_consulting/bt/template_action_path_list
+++ b/bt5/erp5_consulting/bt/template_action_path_list
@@ -1,81 +1,36 @@
-Document Analysis Document Decision Item | print_pdf
 Document Analysis Document Decision Item | view
-Document Analysis Document Item | print_pdf
 Document Analysis Document Item | view
 Document Analysis Document | document_decision_items_fast_input
 Document Analysis Document | document_items_fast_input
-Document Analysis Document | print_pdf
 Document Analysis Document | view
 Document Analysis Document | view_decision_items
-Document Analysis Lexicon Item | print_pdf
 Document Analysis Lexicon Item | view
 Document Analysis Lexicon | lexicon_items_fast_input
-Document Analysis Lexicon | print_pdf
 Document Analysis Lexicon | view
-Document Analysis Module | list_ui
-Document Analysis Module | sort_on
 Document Analysis Module | view
 Document Analysis | documents_fast_input
 Document Analysis | lexicons_fast_input
-Document Analysis | list_ui
-Document Analysis | sort_on
 Document Analysis | view
 Document Analysis | view_lexicons
-Test Case Actor | history
-Test Case Actor | metadata
-Test Case Actor | print_pdf
 Test Case Actor | view
-Test Case Module | list_ui
-Test Case Module | sort_on
 Test Case Module | view
-Test Case Step | history
-Test Case Step | metadata
-Test Case Step | print_pdf
 Test Case Step | view
 Test Case | actor_fast_input
 Test Case | actors
-Test Case | history
 Test Case | instanciate_test_report
-Test Case | metadata
-Test Case | print_pdf
 Test Case | step_fast_input
 Test Case | view
-Test Report Actor | history
-Test Report Actor | metadata
-Test Report Actor | print_pdf
 Test Report Actor | view
-Test Report Module | list_ui
-Test Report Module | sort_on
 Test Report Module | view
-Test Report Step | history
-Test Report Step | metadata
-Test Report Step | print_pdf
 Test Report Step | view
 Test Report | actors
-Test Report | history
-Test Report | metadata
-Test Report | print_pdf
 Test Report | view
-Use Case Actor | history
-Use Case Actor | metadata
-Use Case Actor | print_pdf
 Use Case Actor | view
-Use Case Module | list_ui
-Use Case Module | sort_on
 Use Case Module | use_case_report
 Use Case Module | view
-Use Case Scenario Step | history
-Use Case Scenario Step | metadata
-Use Case Scenario Step | print_pdf
 Use Case Scenario Step | view
-Use Case Scenario | history
-Use Case Scenario | metadata
-Use Case Scenario | print_pdf
 Use Case Scenario | view
 Use Case | actor_fast_input
 Use Case | actors
-Use Case | history
-Use Case | metadata
-Use Case | print_pdf
 Use Case | scenarii_fast_input
 Use Case | view
\ No newline at end of file
diff --git a/bt5/erp5_consulting/bt/template_catalog_datetime_key_list b/bt5/erp5_consulting/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_consulting/bt/template_tool_id_list b/bt5/erp5_consulting/bt/template_tool_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391