From 05abdbf90e745317e668d0bbf3f176e23edb02c0 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Thu, 17 Jul 2008 17:21:45 +0000
Subject: [PATCH] Update XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22533 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Alarm%20Tool/view.xml        | 14 ++--
 .../portal_types/Alarm/periodicity.xml        | 14 ++--
 .../portal_types/Alarm/view.xml               | 14 ++--
 .../portal_types/Applied%20Rule/view.xml      | 14 ++--
 .../portal_types/Base%20Category/view.xml     | 14 ++--
 .../portal_types/Base%20Domain/view.xml       | 14 ++--
 .../Business%20Template/export.xml            | 14 ++--
 .../get_portal_type_properties.xml            | 14 ++--
 .../guess_portal_types.xml                    | 14 ++--
 .../Business%20Template/jump_trash_bin.xml    | 21 ++----
 .../portal_types/Business%20Template/save.xml | 14 ++--
 .../Business%20Template/unittest_run.xml      | 14 ++--
 .../portal_types/Business%20Template/view.xml | 14 ++--
 .../Business%20Template/view_catalog.xml      | 14 ++--
 .../Business%20Template/view_detail.xml       | 14 ++--
 .../Business%20Template/view_portal_types.xml | 14 ++--
 .../Cache%20Factory/statistics.xml            | 14 ++--
 .../portal_types/Cache%20Factory/view.xml     | 14 ++--
 .../portal_types/Cache%20Tool/statistics.xml  | 14 ++--
 .../portal_types/Cache%20Tool/view.xml        | 14 ++--
 .../Category%20Divergence%20Tester/view.xml   | 14 ++--
 .../Category%20Tool/fast_input.xml            | 14 ++--
 .../portal_types/Category%20Tool/view.xml     | 14 ++--
 .../portal_types/Category/view.xml            | 14 ++--
 .../portal_types/Delivery%20Builder/view.xml  | 14 ++--
 .../view_predicate_group.xml                  | 14 ++--
 .../Delivery%20Builder/view_profile.xml       | 14 ++--
 .../portal_types/Delivery%20Tool/view.xml     | 14 ++--
 .../Distributed%20Ram%20Cache/view.xml        | 14 ++--
 .../portal_types/Document/view.xml            | 14 ++--
 .../portal_types/Domain%20Generator/view.xml  | 14 ++--
 .../portal_types/Domain%20Tool/view.xml       | 14 ++--
 .../portal_types/Domain/view.xml              | 14 ++--
 .../portal_types/Folder/view.xml              | 14 ++--
 .../portal_types/Order%20Builder/view.xml     | 14 ++--
 .../Order%20Builder/view_predicate_group.xml  | 14 ++--
 .../Order%20Builder/view_profile.xml          | 14 ++--
 .../portal_types/Order%20Tool/view.xml        | 14 ++--
 .../portal_types/Predicate/view.xml           | 14 ++--
 .../portal_types/Preference%20Tool/view.xml   | 14 ++--
 .../portal_types/Preference/view.xml          | 14 ++--
 .../Property%20Divergence%20Tester/view.xml   | 14 ++--
 .../Quantity%20Divergence%20Tester/view.xml   | 14 ++--
 .../portal_types/Ram%20Cache/statistics.xml   | 14 ++--
 .../portal_types/Ram%20Cache/view.xml         | 14 ++--
 .../portal_types/Route%20Tool/view.xml        | 14 ++--
 .../portal_types/SQL%20Cache/view.xml         | 14 ++--
 .../Simulation%20Movement/view.xml            | 14 ++--
 .../portal_types/Simulation%20Tool/view.xml   | 14 ++--
 .../portal_types/Template%20Tool/diff.xml     | 14 ++--
 .../portal_types/Template%20Tool/download.xml | 14 ++--
 .../download_from_repository.xml              | 14 ++--
 .../portal_types/Template%20Tool/import.xml   | 14 ++--
 .../install_from_repository.xml               | 14 ++--
 .../Template%20Tool/jump_trash_bins.xml       | 14 ++--
 .../portal_types/Template%20Tool/update.xml   | 14 ++--
 .../upgrade_from_repository.xml               | 14 ++--
 .../portal_types/Template%20Tool/view.xml     | 14 ++--
 .../portal_types/Trash%20Bin/jump_bt5.xml     | 14 ++--
 .../portal_types/Trash%20Bin/view.xml         | 14 ++--
 .../portal_types/Trash%20Folder/view.xml      | 14 ++--
 .../portal_types/Trash%20Tool/view.xml        | 14 ++--
 .../portal_types/portal_actions/bt_tool.xml   | 14 ++--
 .../portal_actions/category_tool.xml          | 14 ++--
 .../portal_actions/create_module.xml          | 14 ++--
 .../portal_properties/history.xml             | 14 ++--
 .../portal_properties/list_ui.xml             | 14 ++--
 .../portal_properties/metadata.xml            | 14 ++--
 .../portal_properties/module_view.xml         | 21 ++----
 .../portal_types/portal_properties/search.xml | 14 ++--
 .../portal_properties/sort_on.xml             | 14 ++--
 .../portal_types/Alarm%20Tool.xml             | 66 +++++++++++++++++--
 .../portal_types/Alarm.xml                    |  7 +-
 .../portal_types/Applied%20Rule.xml           |  7 +-
 .../portal_types/Base%20Domain.xml            |  7 +-
 .../portal_types/Cache%20Factory.xml          |  7 +-
 .../Category%20Divergence%20Tester.xml        |  7 +-
 .../portal_types/Category%20Tool.xml          |  7 +-
 .../portal_types/Delivery%20Builder.xml       |  7 +-
 .../portal_types/Delivery%20Tool.xml          |  7 +-
 .../Distributed%20Ram%20Cache.xml             |  7 +-
 .../portal_types/Document.xml                 |  7 +-
 .../portal_types/Domain%20Generator.xml       |  7 +-
 .../portal_types/Domain%20Tool.xml            | 66 +++++++++++++++++--
 .../portal_types/Domain.xml                   |  7 +-
 .../portal_types/Folder.xml                   | 66 +++++++++++++++++--
 .../portal_types/Mapped%20Value.xml           |  7 +-
 .../portal_types/Order%20Builder.xml          |  7 +-
 .../portal_types/Order%20Tool.xml             |  7 +-
 .../portal_types/Preference.xml               |  7 +-
 .../Property%20Divergence%20Tester.xml        |  7 +-
 .../Quantity%20Divergence%20Tester.xml        |  7 +-
 .../portal_types/Ram%20Cache.xml              |  7 +-
 .../portal_types/Route%20Tool.xml             |  7 +-
 .../portal_types/SQL%20Cache.xml              |  7 +-
 .../portal_types/Simulation%20Tool.xml        |  7 +-
 .../portal_types/Trash%20Bin.xml              |  7 +-
 .../portal_types/Trash%20Folder.xml           |  7 +-
 .../portal_types/Trash%20Tool.xml             |  7 +-
 99 files changed, 521 insertions(+), 860 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml
index e93e21f584..26bfb51f6c 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml
index 31a4d0730f..d9789ee3c2 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml
index 512f989a93..133f7e393f 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml
index 484f2fc177..e6c3d25426 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml
index 0548bae5f5..7cec045fc8 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Domain/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Domain/view.xml
index 56dedb0df3..e06edefa6a 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Domain/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Domain/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml
index 89bc1615a6..f04f5e7df7 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
index c50b7670ac..6b4c61b2c6 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
index 1aace16587..16402bb64f 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/jump_trash_bin.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/jump_trash_bin.xml
index 838167fda2..27a007572b 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/jump_trash_bin.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/jump_trash_bin.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>
@@ -72,11 +69,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>
@@ -95,11 +89,8 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=causality&portal_typ
   <record id="3" aka="AAAAAAAAAAM=">
     <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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml
index 1ebbaf848a..7c99e7c8d8 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml
index 672b27b8be..75c51e998e 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml
index b4d55629b9..8b3de6cbd7 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml
index c9bb68a8fd..b6aa024f9e 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml
index 4b55f2aa2b..90cbcabe3e 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml
index 4464733a9e..68771e43b1 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/statistics.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/statistics.xml
index 9239e0f041..d1b3573bda 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/statistics.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/statistics.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/view.xml
index 1d333347d0..624d2543fc 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Factory/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/statistics.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/statistics.xml
index c38b8bfb6b..6995af27aa 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/statistics.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/statistics.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/view.xml
index d6b1a4735b..85557252f1 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Cache%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
index 4ba4663286..fd11f6b322 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml
index d4c1beb508..29a9a89539 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml
index 7780dae983..15a1de248c 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
index 28623d5cd2..b7e57d046b 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
index 72f18943e7..dff1db0b03 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
index d46c8e38c1..b7d42af8f6 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Distributed%20Ram%20Cache/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Distributed%20Ram%20Cache/view.xml
index 0de0867ea3..e746b12c12 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Distributed%20Ram%20Cache/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Distributed%20Ram%20Cache/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml
index e6e629c18b..75f9342bcf 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Generator/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Generator/view.xml
index 323fc950bf..81e45c1849 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Generator/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Generator/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain/view.xml
index 323fc950bf..81e45c1849 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Domain/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml
index 630c817f44..f9e7621873 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
index 72f18943e7..dff1db0b03 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
index 748369fd7b..0a0dd70f91 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml
index 323fc950bf..81e45c1849 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml
index b52e34e995..8176feaebc 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml
index 966f5186ae..618dd34d50 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
index 4ba4663286..fd11f6b322 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
index 610991e19d..466eb3b229 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/statistics.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/statistics.xml
index 01d127ef65..19559d0ea0 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/statistics.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/statistics.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/view.xml
index be5b90ae04..16fe20685e 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Ram%20Cache/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/SQL%20Cache/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/SQL%20Cache/view.xml
index d2364cc888..569293df3a 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/SQL%20Cache/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/SQL%20Cache/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml
index 484f2fc177..e6c3d25426 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
index 5d5f5634d1..cf38dfe389 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
index c20cf1ec9a..ba1c5c20ff 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
index db00223445..54c5b9404a 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml
index 37e961883f..d55bdbe040 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
index 2edc482afc..b171d538d4 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml
index d2aa2d64a4..61e020b1c5 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
index 1b11b16798..3839e9a046 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
index ce44112b89..5de9ff2edc 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml
index ab796cef9d..d31af4d955 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/jump_bt5.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/jump_bt5.xml
index 4f85fab9fb..37766e973e 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/jump_bt5.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/jump_bt5.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml
index 0c36904d01..35bedfe6f8 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml
index 039473e19e..b44ee13092 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml
index 4ea53ce365..f6eaa6ce1f 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml
index 901f839cf9..a22acbf5a1 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml
index 550afea183..3e30974c33 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml
index 2198ac198f..aeda4cd294 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/history.xml
index d7d5171eeb..6fc68d57f2 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/history.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml
index 7a6a344d44..4bfa2a8592 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/metadata.xml
index e162289632..4b52f10d8d 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/metadata.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml
index 1dc48d29ec..4e9a6e7a0a 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_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>
@@ -72,11 +69,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>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml
index dbd2178d51..64753005c0 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.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/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml
index 07455f6f02..49baec44a0 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml
index a559b76ae0..dc3e00d66b 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.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>
@@ -101,4 +117,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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm.xml
index 92f0b1dfac..574b8da686 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml
index 9355299b55..2dd0284f27 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Domain.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Domain.xml
index 4d757fc026..89c178f143 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Domain.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Domain.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Cache%20Factory.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Cache%20Factory.xml
index 09216a3ccf..f7e17bcfd4 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Cache%20Factory.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Cache%20Factory.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
index bd391a63c3..7b7dbd5b87 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml
index 8a636fb40d..9b6b13eb35 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
index 8aebd6e8ea..64daa074e6 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
index ea073dc3a7..777b90b77b 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Distributed%20Ram%20Cache.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Distributed%20Ram%20Cache.xml
index fd156b2889..d8375ddf3b 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Distributed%20Ram%20Cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Distributed%20Ram%20Cache.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml
index 610d9b818e..2c36a94548 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Generator.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Generator.xml
index 0f01a8de00..17c560b487 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Generator.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Generator.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Tool.xml
index 7242a189c9..53b42fbe10 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain%20Tool.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>
@@ -101,4 +117,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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain.xml
index 80e4d0d0b5..9825f5723e 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Domain.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml
index 8397603534..01392487ae 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.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>
@@ -97,4 +113,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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Mapped%20Value.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Mapped%20Value.xml
index dea266dbef..c038837c92 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Mapped%20Value.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Mapped%20Value.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
index d78109348c..75cfcd604e 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
index 7e1f206cea..a36c0dd562 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference.xml
index 11f5c5b693..25109fdb9b 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
index a95df18521..01c11e3fea 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
index c166793282..29db3aa8db 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Ram%20Cache.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Ram%20Cache.xml
index 177d98467f..92dc22f555 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Ram%20Cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Ram%20Cache.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml
index c579773040..81acd3e425 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/SQL%20Cache.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/SQL%20Cache.xml
index 914ea3c522..70c35ae9b2 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/SQL%20Cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/SQL%20Cache.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml
index 307fc76e75..2e01cb83d0 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml
index 4674d398a1..a67d4b6768 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Folder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Folder.xml
index 186813437b..ce9ff3b0e5 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Folder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Folder.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/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml
index 2a75ff34f9..3de94f9990 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.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>
-- 
2.30.9