diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
index 4352a40f7deb67070d9e00d3ac1fe44111624f7a..b000582ce530cf4d882d636bcf0f952d4e75cc0a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
index a0b261a5e06139228233bb59c1b6c603d30d36d3..8c62c289bf7d546c8795655470f530408bd05dd7 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
index d330836405afd00f820ee1b9f285fcb7907ede66..7c53b183ce60c7bbd4dd586f306f35acade33aac 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/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/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
index fedfa8a0858eea88c45e81664125f38268f64dc5..c67847c583064ecdeb3da0a0030ff779d1d9635e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/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/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
index 00d0d7c79ac4d203cea39e3766e39ca4b2058192..5bc76515d13e2363fe93c2aaf49f048c56d3f4f3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
index 18814ae24c234ce0da299a5aaa97cffc70c2c764..6510548e7cc42ada4440a8e6eb0233e8cf065ad7 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
index aa34e43fe00f82723f78e2f6682c776f3fcf9d31..a148fe972352ab1e79e9b84fe62a614cf2f06ba9 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
index 3854be091c0738f230990df9ffc07c1e04e2e32c..1dfec28ddb1edfeb74ea450d412846aa3cdaf78f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
index 02015758bb85d8373a3de83fbe117c39eade674e..f2e0ef30d41608721daa3a5f2d36a60214e8c156 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml
index f7ae0ec876134a90b180c90e70b66c6b9617f6c2..8bb343b508ddae68d38dee5bb3000bd7d02adb5a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
index 84272e57011cab3049ae6e0d3d2574df9ac26d82..fa62f65ed1f455bda66080452ec87029e4a379ed 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
index 8597f83c22f2845d457b54fdaac6e530b4aa631b..6ac5242efd04fcf3fb87049df4a3e9ca04a56f96 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
index 53d25797be5c7cd671032a2e193b9067f07c5052..9031f1bf97c321765a5d78f81ffcdb2530117cd7 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
index 51cbf981a89319a213b3a8a888d7f241d9bb6ab5..93dfb79d1e02db6dcb36bbecffe620b8e1bfddb5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
index 6215aebdcf55abd19ef78f0d26fe30787501ca10..7b14f703c30f344cf4a6c340d50e5f89361611ab 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
index 1f4c4557a21565ea4038711563705a88e1cb67c8..bb0ec0fd98b2c7b5c3e27d84dc5d850a3b0a247b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
index ffb5edf013ee4c22dfd96adff4f5c6fd28363548..2e45aab60e58ebd952ea92aa9df4388cc804dba6 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/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/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
index f0fbf051d8400583f6b04386014c025ecf489a31..d7d361ebc17cf72c50c7a0bd019bdd1d6ed61c22 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
index 99fb4c409dafced067cc1f5670cdf1e33ba8e323..e97aafb898550450a0703e8b4ce8128a4a733bb9 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/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/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
index e3589d974ee800df57f8539d07b8882b9d3e1591..c95967a2b3393225adf3933b19f131b9f3deeb0e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
index a090fcb25138c43ec3409d835e8cc2d53119710f..1ed1432428321227f85af7e71fc96ab8ba41d3bd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
index f7ae0ec876134a90b180c90e70b66c6b9617f6c2..8bb343b508ddae68d38dee5bb3000bd7d02adb5a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml
index bfdcb23c28667bb2ad2af2fe91e9fce77a5acd8f..447b941107e8d720a65712630d52086289f15acd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml
index 9ac37b8365b5d4fad60d9596128e9e1b1d1954c4..400381bef1b79089ddf490b61293251f36853546 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
index 78de83f200c285cf9ac0a0fd2c1c042bd44f9ee9..0f7179c1e3cd52232335e58349cf624b4a87f1c8 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
index 23880b1352c964ebc79c550e8cab82482dbf3654..ba92499dcb9d74d77e494fe98b57d0feaaed9592 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
index c9ba2e57a346f962c4eec2d31ebc67e41fa1ae25..0d86675a521c1adf59cda7c3814ecdcfc840a865 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
index 19f609ae1d109e9f7d53a4c6540f0d0ccd840aed..f6784b8d2f8d7264ae44f93265fc0f55086eb83e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
index bdea974d22e7f63a0091769a5fbbb03ef4a769fc..0f309ca4fb127f3c7a3770078fd7a03032019a40 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/ooo_import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/ooo_import.xml
index 6f18eb9192bcb7e694fbe413a9fae88dd059424e..5f9aff863eb3b870ed56ac5612ba34ff3d759e80 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/ooo_import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/ooo_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/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
index 0756abf9564bc78adbb4e66e858faa1dc2ff9a01..caa9376523b912145b2c06e250522f65b64807a1 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
index fe6e305c583a1e7b76e7febde7f45382b6724937..7c00440b555640a549301816431713a6ecff3e19 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
index 7f2f3f90a7056a0a1f46ce51bc046bfd20919060..b61055a67972611783d13cd02b1b41e4908bb923 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
index dd6d53b5d158bde98f3340a0eb0cb907aa699cfb..0c4fde5c6a4e0287de479ab9b9f7236c59a434f9 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
index 6998157893abb7fd555a88abd35c79744e6ce308..c17fa007ec7195b94f03fef6df942c153f07ecf3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
index e75feaeae991be4e1d186bfca7363cbb53cd4167..53b20fe43cb2321bf4cb660b481ccc9a8d271af6 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml
index 8343af6189b033a4171e661062b815b5b8ef2ee6..ff398c18092d0ed5526db0c3ca4cd6e312988e16 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Query/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Query/view.xml
index b26e2ebef02f21084a65287494fceff438e369c4..f9fc40e9209ff9f976db55d1fbfea222e7c091ea 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Query/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Query/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>
@@ -58,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml
index 760f2c0df6ab102d5af2ffe3314a95871d921977..84eecd4031b76def9276e44ef1bd6d919aa89458 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml
index 4756f9fffbabdf2fbff302118612c8367d172af8..a29b0c5051de8dc0430e4eaec28d72b4055c239e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
index 1f4c4557a21565ea4038711563705a88e1cb67c8..bb0ec0fd98b2c7b5c3e27d84dc5d850a3b0a247b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml
index 6f1578fdc3654e8336e1ee60b92141675ee04ac1..dbad63e64bae17f2558843c4d2861dbfecbcb146 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.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?portal_type=Query&base_category=ag
   <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/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml
index 009c3b8cba30edbc467acd3d2e0b1726c1f2875b..467afefc8a75b462214157676602a3483c153a49 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.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/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
index 99883902bbf83c8a24bed14d7f3a77206ad5de81..27a2f732de80eff0120ed5dcb4666f860d0a5213 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
index 67748629e398b7cc7bc8029f0d3b50985a227327..90609376d1d9868fda0fc9c4f7780f846667a8f9 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
index a0beeb65db52b681238289abdaa42286285c3c52..31ff8f0138d2444f994780ef4da210b3724e3972 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml
index d95d5eabfa801e85eba4ffe75254ebf98e5761f1..87257791157b18796bf66366806a256b3160c547 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
index a7bac90e40daaac850d8075a410e8550310a4b8b..bc6ddbfe72ad97ccb0743d6441b4bb08c0460ab6 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
index 64e62c02697ee9aab57346390397e16efff6ef38..38cc0201d016ae7482bcf72a96f9e83a6992537b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
index 35c276f19011014a99d3f01494c60f6fbde85bc5..3d5c37385e17d9691b37470663dd08115be6903f 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
index 9575adce3b5bcc52784ed3534760be53b6ea0671..0c5ee4e6ca1cf6dde1748353b9a480d5a4a7f8ac 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
index d953593ffcf0ac6e6cd156545d55dcb1efe9ac18..992059c5a511facb60e7057dad75ac81232b5bde 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
index d6813a2a80c78f0c50a1b357d1cf2e43fdbcc1e7..c3565bf5ccb59f24310f47018e2b069cb1b48947 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
index cea474114c2293af4efda118c03d61bdb2dcc311..56f1324652a03a19bf182300e4f862894fe6822f 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
index 4be5127308a27c1f42bd01cd2a890dc412ee4e4b..7045580811d1f5c1b7ae8093e61163023ae7c713 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
index c91879ee9504377a95f51de52c584d24111c9c2c..1f5cb41b96815e9ecf07fd6d258c6b777d854114 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
index d2ed17afdb330929f45ae6267d37b4cc31d71320..9aa2132d40a218db73ae2c0e307d874ef74a61b0 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
index b100fb6c3e421267f7de02e46cdf1ba5dad487bf..eb7bf080995161855af3390873f3068a1ba9c1bc 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
index 1c1905e189c5bc4903aa7967ac46ab87d55ce23c..e7850fe0965d53b8680ffda5e04e04b98a83cb9a 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
index 9c217a27dcabe53892705cbbbfcc984546df0b79..22e519b9824fb3d6e75eb4124003921f55d4a9ba 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
index 28222e7439f9625344d91d328ba0e8049ac8ed39..8fe70218052d4b88de91fcfcaba7923de360b5d5 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
index bdfd640bad98a50130df9341425a59dee9338b6f..db6c29219455e30e1b5d44015efc452264611596 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
index a943afadfefb79a452397c1d7aa39be967e8f018..7a5dc0ec3294a56eab5812a656fe62d12e461012 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
index e9e44cc2828523669e15477cb563f8528004efb6..b21e6acb17c6452414ba84635053f8eeb1b3b98e 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
index daad361b5d10140bc91063fa1252e7b9c929067d..abfebf4cbf386e3a6abd53d915587ecb6f0c6a18 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml
index 1d4cc40b1eec5161e2ca5077c3ea0fc09d811831..1ce0190727bac0ea5b4c5a3c1207c35dd914d1e4 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
index d16b5ce0e77903f7825dc8230ea89dc105e886e5..f5ffad92c9541e388d6ba3a1267e00ccd5e848f6 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
index 4976e7cacc3c0be44f55bdd9884cf78a0c0b59c5..e8ddb43ce695cb4e08160f1dee3870444d532daa 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
index c36dbc1716ad82faf8621c8ff0626a22fffbb403..1fd9b6a05936693f23a46899531eba09a4317c59 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
index 302ace625410dc494465a28b1c2dab628e75c5c9..460f606f9b24de535a0562d1857541fcbf582e84 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
index 743a3bf137632d90ebaa44d84da51bc1e3007cae..50d6a3ff067626a193cc874148450a5ff229256e 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
index b72bb287b007c1456bf720e95c4823fc89905e9c..9a9803b47db2b13dc2c828ae65f4b6cbe4e88d80 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
index d9944d4f58f0f9d814ae7fd989cf183107f50334..b3148dbe970a5c62e8150b4217f551021a2ec558 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
index a09bdebcb3540b5b6a8117d0bdbb1478bbeba4c7..66785eb8f209b86d6eb0cc512e60c154e4a82f83 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
index 846e1cce610d89f7a9c8750cd204beda2ce56ebd..5adabd35b507daffdf39913d4231b8a005917c30 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
index 103bb7d8f982ea69ab8cfcf6770671771d5ae86f..3df0785471f92fb1d6950852abcc6c34caea6900 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
index bf271475dacdb12b4d9943429804d532ef850f75..32a5b4a9e4bb5681e331f0e806e036aa69ad3c99 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
index ac621caeeb3896305475d06cdb6175284fe78564..aa2bfd2e09f7f6fc60cfc6803480c6f191735b7b 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
index 76447fd52e5bb9668f7a71936934201e3a130f7d..c62ce6195568a84191034d132c7cb34b1675a572 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
index 102e04b6e1c261f1202319735f0279539cec5214..9eea2a76041715c8aa1057d9e7db13e88592f6ad 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
index 4acb3ed1f778f510c9fe64d111df23a44aa9411f..e63347532bddf5de10763a16d484e5c9106743a9 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
index 4fa8278dea6221d8e505b2c3bd45a5de247e5a96..4a410ca976e29a508ccb37ad01e0e68dcdb24f63 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
@@ -98,7 +98,7 @@
   An ERP5 Binder document class will eventually be defined\n
   in order to implement a binder of documents which can itself\n
   be categorized.\n
-  </string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
index 1e04c1d3ed1132f13f753275d9b1493157d3b355..48f2d00b5311e3fb1bd4efa7d409310f768f3325 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
index 4310fe7ef170f9050e9abd06e2a6003f9d23b508..3cb3eb95a1b5874c9165ed98ed71853bad231246 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
index 0a335878f3ecc4050855d4ebe6d6c7489a777caf..bf03dcd981ca76d6ebb24f41aa42923815d0c2d7 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
index e65b59c529900aa6c7a9e8bef724bbca8c7e4062..dd545d0ab8e0a1059b4ffe9b5566e11b33263436 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
index a74e186f300ec27583aca30728200ecff4870052..0e49244c7a725d1da9e95491491cc29f50a5a44c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
index 96f772944fa9c396123af63c047cd5298017cd61..3a9b1a7a17160095d6352a37a2ffae1cc700e30a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
index a4530c125153220fe145a2a35227e77c83b785ca..150181d2fe58357932c894d002fbbdcd3c85be14 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
index 1f33d105f80c36e2cc2ab9b26b2ace091e62f573..71fdd276e24fddf52d55bd069156c8d17421a23a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
index ccbcb67fa7fef44d4cc357d56aaa15f99e10bc44..7811e4f24b1258daeaa14b2e7abb019f96225835 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
@@ -155,6 +155,12 @@ return reference\n
             <key> <string>id</string> </key>
             <value> <string>BankAccount_getReference</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
index 5d7c3ea0f6656501ca9326ec685bfed39dd34a4e..1eb592e052be9d9925cc26976d310c8ce2af98a4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
@@ -172,6 +172,12 @@ return context.Base_redirect(form_id,\n
             <key> <string>id</string> </key>
             <value> <string>Base_changeId</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml
index ef7c38f4718f08b7d7dc669710b9fab5cc04d17e..6f0190ddd6654770bdbb315ed867f59329d846c8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml
@@ -318,6 +318,12 @@ return code_dict.get(code)\n
             <key> <string>id</string> </key>
             <value> <string>Base_convertCurrencyCodeToNumericCode</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml
index 645562280000cd1f57615614f9abb4ee9ebb214e..034e9a423334ee3a1a82f6dc7580c5812768bdf7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml
@@ -171,6 +171,12 @@ if organisation_url:\n
             <key> <string>id</string> </key>
             <value> <string>Base_getOrganisationForSectionCategory</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml
index 709888e5f2524aad3aba74cc91c6fcde49aafd6e..cb18bdf795fdc8c457092c6b2e4f389113d0a561 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml
@@ -158,6 +158,12 @@ return method(local_sort_id=local_sort_id_list, checked_permission=\'View\', **k
             <key> <string>id</string> </key>
             <value> <string>Base_getPreferredCategoryChildItemList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml
index 70201b0cf7e98375d98607f71eb8850445cd4470..b5bd8342719e6b74cea07f65aa2c38f3f2304eb0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml
@@ -154,6 +154,12 @@ return getSectionUidListForSectionCategory(section_category)\n
             <key> <string>id</string> </key>
             <value> <string>Base_getSectionUidListForSectionCategory</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml
index 6cdbf611f230895266c1aedc7d3b687c370e4d3c..b9ebe2ac523ec74501d3becb457099ba39de9adc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml
@@ -172,6 +172,12 @@ context.edit(\n
             <key> <string>id</string> </key>
             <value> <string>Base_initIntIndexAndReference</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
index f9ba602c203666fb3ab279ed048562116daa76cc..76ddee9ef32efdfc43ce466f8f0483a1d12121cd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
@@ -149,6 +149,12 @@ return query\n
             <key> <string>id</string> </key>
             <value> <string>Base_newQuery</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml
index d83e2853a231be005a32ddcf87dff45108cf7c0c..b9a7ecccd56b8f5987022b36fe1a03c92cb502bc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml
@@ -169,6 +169,12 @@ return context.Base_redirect(form_id,\n
             <key> <string>id</string> </key>
             <value> <string>Base_postQuery</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml
index dd4a3dd68ecb3d9e8dacff4443d2dd84ad8081cf..30303ff71622c87c45459e575616049cd680e240 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml
@@ -140,6 +140,12 @@ return context.getFunction()\n
             <key> <string>id</string> </key>
             <value> <string>Career_getFunction</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml
index 314ace29b2a8b195e7f38fec9573de5414f89d87..8b7d5d50f78aafcdec3fe55080f59eaf9bf31faf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml
@@ -172,6 +172,12 @@ return result\n
             <key> <string>id</string> </key>
             <value> <string>Career_getFunctionItemList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
index 026eb231218b121996e77acbe5c634671023f1ee..e4bc6566039d90e28162e272613f816bfe1996e7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
index 0d1168f93f23f73536463ecc3fda91e6b5022ca5..ed753032c3b655eaca20d219567228547c028a61 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
index b629cb4d82abd5131c93b212fbb267c6acc6a632..6e586118a514dfba8c3c96d4806ada3f0a4c3b7e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
@@ -65,7 +65,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -75,7 +75,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
index fcb3cfdf0128371ae20a5145eee4392db2ba53ab..3ceec97246d3928ab77f004251067be5f806bc9a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
index da75b6334c5618c738f91a11077671f2f0f8b58e..8f00da7ee76cb183c0f719bf9e180024b50c8ead 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
@@ -145,6 +145,12 @@ return None\n
             <key> <string>id</string> </key>
             <value> <string>Coordinate_asURL</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
index c15867f77951690054cee4fbe575894b6c39f283..9ec0dfa5c30e96de8f21c9edba4640428932ed70 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
@@ -148,6 +148,12 @@ return (currency_exchange_type_list, resource_list, price_currency_list)\n
             <key> <string>id</string> </key>
             <value> <string>CurrencyExchangeLine_asCellRange</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_init.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_init.xml
index e0f6471451807c882bd0047a39eee0a38e265dad..32ea033f8ca454fe7961dc419c9d4a0e205ece20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_init.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_init.xml
@@ -128,6 +128,12 @@ pass\n
             <key> <string>id</string> </key>
             <value> <string>CurrencyExchangeLine_init</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
index 92fd787ef58bb2c9607f9cf32a63777d53214dea..930962ed25b8b71f7ec9f484bee72678e13d9141 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
@@ -241,6 +241,12 @@ return result\n
             <key> <string>id</string> </key>
             <value> <string>CurrencyExchange_getExchangeRateList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
index c5bcaf0d8770c7c9d101cdc6b5c4ef435d801918..34075ace03b37e304b6e66cf6d8f443e85460d92 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
@@ -172,6 +172,12 @@ return getCurrencyItemList( include_empty=include_empty,\n
             <key> <string>id</string> </key>
             <value> <string>CurrencyModule_getCurrencyItemList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml
index 7333294064a44c6b21b6048dda7cff44b31f1565..278eb9c8ecb8465240616672d0df5cb5a6a1ab0c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml
@@ -129,6 +129,12 @@
             <key> <string>id</string> </key>
             <value> <string>Currency_asNumericCode</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
index 7f0b0826b656d9cef82f9de6abe73f07a0777b4f..b6e828e5726842e3e8b20704f1a349f7ca26a1f1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
@@ -372,6 +372,12 @@ return unicodeDict(data_dict)\n
             <key> <string>id</string> </key>
             <value> <string>Delivery_getODTDataDict</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
index 44afe675757ef9cd4fd8e63d13fd853babf4e9e4..41c6b9adf7c20399b1f7057f5f6e54913c7446a4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
@@ -161,6 +161,12 @@ return found_user_list[0].getObject()\n
             <key> <string>title</string> </key>
             <value> <string>Get current logged in user\'s Person object</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
index 2497b30d70b8b46823f376bbb8cf7fa479b32552..86827ca6566eb3f96bcbd6a50c193d90d2ed1fcf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
@@ -176,6 +176,12 @@ return result_dict\n
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_getCategoriesFullPath</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
index efa2279b3cfaa537ce9115673fd3ea192b97eb3c..b0ce9ac3aedbf3ca9805b2f223ec5465594404ab 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
@@ -154,6 +154,12 @@ return [(\'-- Ignore this Property --\', \'\')] + map(lambda x: (x,x), property_
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_getModulePortalTypeSortedPropertyList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
index d8e059c35cfebaee6e11e5aa7a25c481c4ab09bc..25b6966946a1a36e03fd4d79a4898f5bf12d8a9b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
@@ -184,6 +184,12 @@ return listbox_lines\n
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_getSpreadsheetColumnNameList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
index cdcd3875d9a45d27cc8eada99c7139524fb409cd..1f271311a75ea708136af0b859d77cc00455d24e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
@@ -303,6 +303,12 @@ return context.ERP5Site_importObjectFromOOoFastInput(REQUEST=request)\n
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_importObjectFromOOo</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
index e9239218d7f2ce5bc9d873549c85e152dc1f1190..dd69c139b1a8b0abf0ec7584821965ac131be531 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
@@ -185,6 +185,12 @@ for (module_url, per_portal_type_data) in object_list.items():\n
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_importObjectFromOOoActivity</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
index 42cca7255adcfbdc7e4327f33aad8eb9d30d2417..bae599cb7c440ffc74ec20e2dbc2723ec3db9bb2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
@@ -180,6 +180,12 @@ return category_dict\n
             <key> <string>id</string> </key>
             <value> <string>ERP5Type_acquireSecurityFromCategory</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
index 3d11977eee7012a176eef19749701ff969676444..4a5adf09491f0a10082268cb1c39fc70f3d025d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
@@ -139,6 +139,12 @@ if email is not None:\n
             <key> <string>id</string> </key>
             <value> <string>Entity_getDefaultEmailAsURL</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
index d55a96f0974afcb43b5faa498dc898f854976277..eb305e133fca1ae70a33f5d0dcf1f359ed3d7b1f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
@@ -139,6 +139,12 @@ if telephone is not None:\n
             <key> <string>id</string> </key>
             <value> <string>Entity_getDefaultTelephoneAsURL</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
index c0f4a5d6ea96f36014b64047f83c41e94e14555b..0d95247476b2e636e5c173228e3bbce12eeb8f05 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
@@ -139,6 +139,12 @@ if telephone is not None:\n
             <key> <string>id</string> </key>
             <value> <string>Entity_getMobileTelephoneAsURL</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
index c754de6949354f69438bcff76f8934809907078b..07bba1030f858520aadb43bd7adf9627b2e32b3f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
index 71b6f57bb83b816968db62b081f6cb4a13b64eba..5d0a55681364aa44c47f7057ffacba34fde589a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
@@ -263,6 +263,12 @@ if download:\n
             <key> <string>id</string> </key>
             <value> <string>Event_send</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml
index 504c6170ad9041e6ca86aae412830de60b54dd12..5162f5d6a1c56ee0acc0c4159cbd392650d8e8a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml
@@ -87,7 +87,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -95,25 +95,25 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml
index 4b63d3ffa00bce9ea8c477a864bcb29ecca11b60..36873fbd2bf55c8fd30ab7eddaa526bc807ba804 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml
@@ -80,7 +80,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -130,7 +130,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -161,11 +161,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>notification_message_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -184,7 +184,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -219,7 +219,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Notification Messages</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml
index f73668dbe9a241c48420f91854262ca6824c0039..2fe5d0aeb528edb8c766e68b3e9fa6fbbf8ae3a0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml
@@ -87,7 +87,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>my_text_content</string>
@@ -95,7 +95,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -103,13 +103,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_title</string>
@@ -121,7 +121,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_function_list</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml
index f01ffc860403d2ffc4bc2d100b6f4e1788a9b204..3c9c06d97f8b90041d27888d4b9eca24bbda8aa2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Language</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml
index 21917c880d8123010506cfe8d31c6e6a5b8f7a01..6c8c8d2d792c2e22a0f931c8ee25de1882585961 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml
index 479bd9d0cf999f2720691def1ee44627fee7ef75..866596087e982091c6b60da1fbf79d6c2b5c0527 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Version</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
index fcdf72d2bd1fe6114d9525a7e174db787e312756..f75294e2ed79a51ecadeba65ba814231c9875f38 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
@@ -210,6 +210,12 @@ return notification_message\n
             <key> <string>id</string> </key>
             <value> <string>NotificationTool_getDocumentValue</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
index 1da915ea3d36c126fc03690cd3915f92c7b060d3..7ead06eb2c1e69f8c85897a1157f880447dfe9e0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
index 44d92f2932127a9a97456ef98b1f878153330595..ab63714b91d4e144403db1bc5d201e7eaeb8ba70 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
index 725b5a00d6ba40d144232df5e171cec8e9533cd9..fe1baedcdabf5514041d4489fa63cb3699f00a77 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
index 8e078e266762b9d793c3b333fd81e1105ad5213b..04945b3b8ed9f513c225e65742ca7654ed952501 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
@@ -89,7 +89,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -206,7 +206,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -245,7 +245,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -280,7 +280,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -311,7 +311,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -326,7 +326,7 @@ Role & Region
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -437,11 +437,11 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>person_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -452,7 +452,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -567,11 +567,11 @@ Role & Region
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Persons</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
index a57719c5db0f44a037aadb1d435e6264fe935e98..ea64cb854613cba946269686febf7e09cd12ef96 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
@@ -151,6 +151,12 @@ if not is_business_template_installation:\n
             <key> <string>id</string> </key>
             <value> <string>Person_afterClone</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
index 49177d1d49531beeb57108dc5f63665a3f7afd72..7f305c9c330278bf9c001f6e1bb042fb858e9c90 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
@@ -213,6 +213,12 @@ return newpass\n
             <key> <string>title</string> </key>
             <value> <string>Generate human readable random password</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
index 568fc520bffc7db074abe35422c742114a6d6e56..7ca96d9720f158baa85d4b92114ace9e766dcca8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
@@ -166,6 +166,12 @@ return N_("${year} Years Old", mapping=interval_dict)\n
             <key> <string>id</string> </key>
             <value> <string>Person_getAge</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml
index dec65121bea5a1e4d74cc163dadd5cf301614f3e..5c3448ed15d233b304cb5aa31a9ee9f90532c5e1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml
@@ -156,6 +156,12 @@ raise ValueError, \'No Career Step Defined.\'\n
             <key> <string>id</string> </key>
             <value> <string>Person_getCareerStartDate</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml
index 35014dc06d410ac8d4578481a298e1dab796b54a..3591684e906aff1a4be9465f30a214fc60795116 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml
@@ -174,6 +174,12 @@ return career_list\n
             <key> <string>id</string> </key>
             <value> <string>Person_getPersonDetailedCareerList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
index a2865b4106fbfe3ab11ea2e0888121905dd3f608..7f0a22d32f7f1bc53c4670caee0402f819495244 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
@@ -270,6 +270,12 @@ return line_list\n
             <key> <string>id</string> </key>
             <value> <string>Person_getPersonDetailedContributionList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml
index 12097ebb3db7047144be493e3f07cad6c60d733a..2e779d511821bafa798d26e3db9f427d5f70f163 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml
@@ -182,6 +182,12 @@ return event_list\n
             <key> <string>id</string> </key>
             <value> <string>Person_getPersonDetailedEventList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml
index f594977119c37c17ddb8f7fbc7a6475abe99959b..9acced781e64d5b9c8b0695ed8c4ab5ea8452dcc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml
@@ -222,6 +222,12 @@ return result\n
             <key> <string>id</string> </key>
             <value> <string>Person_getPersonDetailedReportSectionList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
index e69f2542590721ad2421e7c5fe5d00f2df8bb442..5b82231b10fab052160db96107237a22eac1a88e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
@@ -203,6 +203,12 @@ return context.getGroup()\n
             <key> <string>id</string> </key>
             <value> <string>Person_getPrimaryGroup</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
index 0f93ab530ed0e0b03c02aab4ccdc00abb96b4915..c9b8c5a2188fa0527b291e062f9555037c84b502 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
@@ -162,6 +162,12 @@ return context.Base_redirect(form_id, keep_items = {\'portal_status_message\' :
             <key> <string>id</string> </key>
             <value> <string>Person_resetPassword</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
index 0fcf91f534aceeb05bb8ec44bfa0348d2e11a963..97a631e2f671279deb80062032f0cc6532203231 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
@@ -202,6 +202,12 @@ context.MailHost.send(messageText, mto, mfrom, subject)\n
             <key> <string>id</string> </key>
             <value> <string>Person_sendPasswordNotification</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
index 646809146a1f4cf01db92b04d9e85d22fc0e539e..6046cceb4f3ae17bb6c8ccbbccbfca841737742e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
@@ -203,6 +203,12 @@ else:\n
             <key> <string>id</string> </key>
             <value> <string>Person_shiftDefaultCareer</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml
index 4f5bf314d58fd4c69e9a4b040d844bbb5e2008c8..a09a9d1b752d5043842251b232dc7c0db8e60bcb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml
@@ -244,6 +244,12 @@ return [obj,]\n
             <key> <string>id</string> </key>
             <value> <string>Person_statPersonDetailedContributionList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
index 2390f9533e73eb6969797a6996291c1f4618eb6c..caafbf223ca336b9c500c641979a6bc885bfcb80 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
@@ -202,6 +202,12 @@ user_folder.setGroupsOfUser(security_group_list, user_name)\n
             <key> <string>id</string> </key>
             <value> <string>Person_updateUserSecurityGroup</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
index d9acc7726689e29fd83b79d726ad24312588ece8..fe6c87049c7ba890f0fb22dc0f4e038ed5194c7b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
@@ -144,6 +144,12 @@ return 0\n
             <key> <string>id</string> </key>
             <value> <string>Person_validatePasswordsMatch</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml
index 42d3b1e7e5d8935240716611b5355a04fc355792..88fb16214dbfd2e9d05cc3b6175a8d3f1e024034 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Birthplace</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml
index 1c39ea71322b9a7323c0e1d03ef3b37815378ff9..bb0da40239aee7d997c538a47693aa1bb2e7941e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -103,7 +103,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml
index 13040e37a8f7f16d5e4c53f146d1c3b92e212f52..2dd973832b7183c70e4f7225ad3d406434be3970 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml
@@ -101,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -140,7 +140,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>count_method</string> </key>
+                    <key> <string>count_method</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -160,7 +160,7 @@
                     <value> <string>ORGANISATION_LIST</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -170,7 +170,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>person_detail_event_module_selection</string> </value>
                 </item>
                 <item>
@@ -178,7 +178,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Events</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml
index 1972b4123adabdb10f0d71fb3cdb04b77897f8cf..da30d3d41965bc66ed4fe0621aaf3b1907d79fab 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml
@@ -138,6 +138,12 @@ return \', \'.join(context.getAgentTitleList([]))\n
             <key> <string>id</string> </key>
             <value> <string>RoleDefinition_getAgentListAsString</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index ba3006739b90fb386f12623c6c49ea89d212ad0e..2291c046ea20295f69366f2199e6eb81d788660c 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-372
+373
\ No newline at end of file