diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/history_view.xml
index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..64e0c954df6c9e637946070a3e6faf0a0db3d91b 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/history_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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/print.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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/view.xml
index 55d016dda3bdc2e34b349ce4dc89a73db8731e98..aaf39a2297d0b8784b18bd12716595c58e5afadd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Cell/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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/history.xml
index 6ddff8ee357c34d576466248a979e3cf45360dbd..313d4b2fe918d0a6787db134262dacf16c8546de 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/metadata.xml
index f4f1655d615fd25d4333934b6ef806aa89131b50..afee9c36946a13e63b5332d5efb003c5a1eba7c4 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/price_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/price_view.xml
index 2f52fa62565d0ce0d7a99bc8d627fe9506598f81..cc2e9d15d181564427246660a9127e53a4cbfaf9 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/price_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/price_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/print.xml
index b0646266af9bcfa65bced1b85450797af4c0f88a..00f626374105c94a6b232057778dc43ad4e9ca96 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/print.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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/quantity_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/quantity_view.xml
index 42d704007891c1c9ff44cf8c6d4a5f397686044e..bbf4784a6dbcbf1984543e708e9fa527d30b8114 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/view.xml
index dc675d629fd94ddc025081f48fa4aa699dc55b1d..b57589802a5ab63de859c20451fa4277f130c5b9 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Line/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/csv_export.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/csv_export.xml
index df3dee79648835fe1d78dd61202cffbc4579fad4..5608aea01b40b1e995cdf88d1d4dc7c25a2434a8 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/csv_export.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/import_csv.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/import_csv.xml
index c68b13d7c60e403b7ccd14700875d2d333808d6d..3cfe95721f77701cb93094d938f51b390ed8c5fd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/import_csv.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/import_csv.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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/list_ui.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/list_ui.xml
index 319f5c597081b27487c07ff796fae73cd81025ea..66954514c3852a9bc669834f1453135a7097affc 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/list_ui.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/print.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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/search.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/search.xml
index b5e9ee59ec1b1e44159b122062527835f81089cb..f7b0792cefc82b001d6471a888dbc16b6431ec92 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/search.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/sort_on.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/sort_on.xml
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..99880f65baee2149ac54ce12393361ef5ffe41a1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/sort_on.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/view.xml
index a2ac1bf3b6935ffd0cbda1762bd137f7d87c88da..85a3957cd8c465ac48a244d3647e9c3484b674ca 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Module/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/print.xml
index f871a92fc492fade01b7b3a159367f89daca1302..d738ed1bb6868d34afe3ef30f4ac299cd00a5965 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/print.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_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/view.xml
index 97da81ac4e280e64141d33186eb847ba9229bf29..16c8d462c930da88c4446c0df3f3b08ff162fed3 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_packing_list.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_packing_list.xml
index 52701be79cb5c14cabc3ec15bf108701bda0a373..5baec95502e28d44739be756305c13c8703095fb 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_packing_list.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_packing_list.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_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_report.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_report.xml
index ab1c6518fc2c4d58e428762673b2ab4bbb973912..9dc2d9e0467c28191ebe8e0d01b632d6f7e07a80 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_report.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_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_mrp/ActionTemplateItem/portal_types/Production%20Order/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/payment_condition.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/payment_condition.xml
index 42a1e682c9a3cd968a1f04f6d558cf7acb87063c..ae32b6fcf8355eb1b0520ec8060b1876277c7de9 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/payment_condition.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/payment_condition.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_mrp/ActionTemplateItem/portal_types/Production%20Order/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/print.xml
index e64988d8898046458943c5397b0a175f7444f711..6f01d4baae8ba637454c75efe4fb9e4b48823751 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/print.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_mrp/ActionTemplateItem/portal_types/Production%20Order/profile_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/profile_view.xml
index 2a693e1fa3d7c930fffd58663e7ce0c3da6bbe88..4b5aedaefe4431252d65ec5e3cc775b60198ec3c 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/profile_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/profile_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_mrp/ActionTemplateItem/portal_types/Production%20Order/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/view.xml
index 8df4d719fef23d1364849d6b8eff741dd6257369..f9be612172a24f6980976f05539362823ebdad1d 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/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_mrp/ActionTemplateItem/portal_types/Production%20Order/view_discount.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/view_discount.xml
index 50405be2937ef3e22d1e4b82766e5f2ed48f622b..12a1fb949687504809ca72a174e220f6ba6cf2be 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/view_discount.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/view_discount.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/history_view.xml
index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..64e0c954df6c9e637946070a3e6faf0a0db3d91b 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/history_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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/print.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/view.xml
index 55d016dda3bdc2e34b349ce4dc89a73db8731e98..aaf39a2297d0b8784b18bd12716595c58e5afadd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Cell/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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/option_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/option_view.xml
index 6aef8025adfefe45ee116f18780e45a2f771cd60..3b997535918a1b861e67f053b9f46fb5e1486a70 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/option_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/option_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/print.xml
index e64988d8898046458943c5397b0a175f7444f711..6f01d4baae8ba637454c75efe4fb9e4b48823751 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/print.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/quantity_view.xml
index 42d704007891c1c9ff44cf8c6d4a5f397686044e..bbf4784a6dbcbf1984543e708e9fa527d30b8114 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view.xml
index 18133b29c708936cc157ea1b7de66821f28967a2..33546510c9d204804b0fc3d56b5dc6e9cb4b1189 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view_price.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view_price.xml
index 11c5591182e68ecdbd1175eb3910be10de2c9d27..0d3c46b9fcf7e4d6c862683ced4de6f80a120f4a 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view_price.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/view_price.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/csv_export.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/csv_export.xml
index df3dee79648835fe1d78dd61202cffbc4579fad4..5608aea01b40b1e995cdf88d1d4dc7c25a2434a8 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/csv_export.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/import_csv.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/import_csv.xml
index c68b13d7c60e403b7ccd14700875d2d333808d6d..3cfe95721f77701cb93094d938f51b390ed8c5fd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/import_csv.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/import_csv.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/list_ui.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/list_ui.xml
index 319f5c597081b27487c07ff796fae73cd81025ea..66954514c3852a9bc669834f1453135a7097affc 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/list_ui.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/print.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/search.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/search.xml
index b5e9ee59ec1b1e44159b122062527835f81089cb..f7b0792cefc82b001d6471a888dbc16b6431ec92 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/search.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/sort_on.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/sort_on.xml
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..99880f65baee2149ac54ce12393361ef5ffe41a1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/sort_on.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/view.xml
index 475bf91a7979b4eff5955bc579069f7d252e57d2..4492eaf693b777ecb0bf7b172dc423c1ba445f89 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List%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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/history.xml
index d54a254eb99329e073abd0a8dedeb3c8d5ee6a1d..17e1d3b1bb1d6a2b17c209554e2a36df3ae902ce 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/print.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_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/view.xml
index e08c5afab6edd24fa3adb663dff7291cae5ddd24..48bf3691e3c55bae0c8b320bdf6432c28bdc986c 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Packing%20List/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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/history_view.xml
index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..64e0c954df6c9e637946070a3e6faf0a0db3d91b 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/history_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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/print.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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/view.xml
index 55d016dda3bdc2e34b349ce4dc89a73db8731e98..aaf39a2297d0b8784b18bd12716595c58e5afadd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Cell/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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/option_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/option_view.xml
index 6aef8025adfefe45ee116f18780e45a2f771cd60..3b997535918a1b861e67f053b9f46fb5e1486a70 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/option_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/option_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/print.xml
index e64988d8898046458943c5397b0a175f7444f711..6f01d4baae8ba637454c75efe4fb9e4b48823751 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/print.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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/quantity_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/quantity_view.xml
index 42d704007891c1c9ff44cf8c6d4a5f397686044e..bbf4784a6dbcbf1984543e708e9fa527d30b8114 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/quantity_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view.xml
index 18133b29c708936cc157ea1b7de66821f28967a2..33546510c9d204804b0fc3d56b5dc6e9cb4b1189 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view_price.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view_price.xml
index 11c5591182e68ecdbd1175eb3910be10de2c9d27..0d3c46b9fcf7e4d6c862683ced4de6f80a120f4a 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view_price.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view_price.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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/csv_export.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/csv_export.xml
index df3dee79648835fe1d78dd61202cffbc4579fad4..5608aea01b40b1e995cdf88d1d4dc7c25a2434a8 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/csv_export.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/import_csv.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/import_csv.xml
index c68b13d7c60e403b7ccd14700875d2d333808d6d..3cfe95721f77701cb93094d938f51b390ed8c5fd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/import_csv.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/import_csv.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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/list_ui.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/list_ui.xml
index 319f5c597081b27487c07ff796fae73cd81025ea..66954514c3852a9bc669834f1453135a7097affc 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/list_ui.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/print.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_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/search.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/search.xml
index b5e9ee59ec1b1e44159b122062527835f81089cb..f7b0792cefc82b001d6471a888dbc16b6431ec92 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/search.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/sort_on.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/sort_on.xml
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..99880f65baee2149ac54ce12393361ef5ffe41a1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/sort_on.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/view.xml
index 28e14189992d00072c2045025eeb737de5ca7cd2..a7fbb9faa6c5ea65c2beb1249ed1883ffad77ed5 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -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_mrp/ActionTemplateItem/portal_types/Production%20Report/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/history.xml
index d54a254eb99329e073abd0a8dedeb3c8d5ee6a1d..17e1d3b1bb1d6a2b17c209554e2a36df3ae902ce 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/print.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_mrp/ActionTemplateItem/portal_types/Production%20Report/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/view.xml
index 421b805e5ebe8296c7260dca380c7d68178bcefb..96dfd9b86b6d73a70f6bbb6805a2a2ea24c6b809 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -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_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/csv_export.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/csv_export.xml
index df3dee79648835fe1d78dd61202cffbc4579fad4..5608aea01b40b1e995cdf88d1d4dc7c25a2434a8 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/csv_export.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/list_ui.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/list_ui.xml
index 319f5c597081b27487c07ff796fae73cd81025ea..66954514c3852a9bc669834f1453135a7097affc 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/list_ui.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/print.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_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/search.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/search.xml
index 844ad76c4cba2e80aa4b44a5f19873412f329e34..9c11a1f3aee475254effd43618f1d429ae387d5e 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/search.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/sort_on.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/sort_on.xml
index 844f84b37f21c6fdc5cf5609c0bebf688cfe83be..99880f65baee2149ac54ce12393361ef5ffe41a1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/sort_on.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/view.xml
index 8b129956f5e421226e5fc0803985c02174932fda..8b89b71fcdf3233a99d6d8efaeaf0cef6aca1fcf 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%20Module/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain%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_mrp/ActionTemplateItem/portal_types/Supply%20Chain/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/history_view.xml
index 9bce0b5a03d20a1bc77f721fa4b48bf1f29a53e3..eb1025ab439b0186f5b8ffb311dc518ac813644f 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/history_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_mrp/ActionTemplateItem/portal_types/Supply%20Chain/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/metadata.xml
index 65fccc750607dcfd4dbc95ae48ff9773f1228a3f..d99840455b28d1a9fab69d27b4aa1ae3fd513bfd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/print.xml
index 760f443706f1c5881e98fc1d827b7b567f6010e9..485cc99472465945ee03b2b015eaa1a43dd5475e 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/print.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_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view.xml
index 6784ffcff253ada0a9db2a52fe24b14fe1579a7d..b419035bbe2b2720e2baa6923a21c76803a95e6c 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/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_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view_supply_node.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view_supply_node.xml
index 94cc50c2dca75a0781f92bf57bab92484cf4415f..b63e621a0be3267a058dce3ef8af663bcbb1c430 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view_supply_node.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Chain/view_supply_node.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_mrp/ActionTemplateItem/portal_types/Supply%20Link/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/history_view.xml
index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..64e0c954df6c9e637946070a3e6faf0a0db3d91b 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/history_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_mrp/ActionTemplateItem/portal_types/Supply%20Link/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/print.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_mrp/ActionTemplateItem/portal_types/Supply%20Link/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/view.xml
index 9fc9909bc531c7e76e06ec5ea3b78bb7d3149440..e9f721c0cdc9fa2166f8d78d5a96a669666932df 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Link/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_mrp/ActionTemplateItem/portal_types/Supply%20Node/history_view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/history_view.xml
index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..64e0c954df6c9e637946070a3e6faf0a0db3d91b 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/history_view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/history_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_mrp/ActionTemplateItem/portal_types/Supply%20Node/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/metadata.xml
index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..8b71d32e751ff5a47454d5d6bcdcbc3548ebfaa6 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/print.xml
index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..caf335eb14ac68e8d7061fe1eb3ad2c5d0e3e785 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/print.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_mrp/ActionTemplateItem/portal_types/Supply%20Node/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/view.xml
index e56cf64b52056417529abefe50bb6802a97bee81..73bae9f1cf96f3f8e25e1994755f3aac6b511f55 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Supply%20Node/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_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/print.xml
index f871a92fc492fade01b7b3a159367f89daca1302..d738ed1bb6868d34afe3ef30f4ac299cd00a5965 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/print.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_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/view.xml
index 97da81ac4e280e64141d33186eb847ba9229bf29..16c8d462c930da88c4446c0df3f3b08ff162fed3 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Rule/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/history.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/history.xml
index 7967a23223e15447736cd7ebae02207110249870..cd08777edc2f4ca6628e136a9afa08773490fefd 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/history.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/metadata.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/metadata.xml
index 919165fa3eaf7050e0e17fa951b4c1d7585a0433..49b94c845c03317d876f637d77f56ff4b37143d1 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/metadata.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/print.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/print.xml
index f871a92fc492fade01b7b3a159367f89daca1302..d738ed1bb6868d34afe3ef30f4ac299cd00a5965 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/print.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/print.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_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/view.xml b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/view.xml
index 97da81ac4e280e64141d33186eb847ba9229bf29..16c8d462c930da88c4446c0df3f3b08ff162fed3 100644
--- a/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/view.xml
+++ b/bt5/erp5_mrp/ActionTemplateItem/portal_types/Transformation%20Sourcing%20Rule/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/ModuleTemplateItem/production_order_module.xml b/bt5/erp5_mrp/ModuleTemplateItem/production_order_module.xml
index fc097a81e51f57603c493d8a63513c6198aada65..8a648fb107e8d7f2ccfb2f60be49f6b1db93933a 100644
--- a/bt5/erp5_mrp/ModuleTemplateItem/production_order_module.xml
+++ b/bt5/erp5_mrp/ModuleTemplateItem/production_order_module.xml
@@ -224,16 +224,11 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -244,7 +239,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +273,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,7 +290,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +308,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -394,10 +382,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -453,6 +437,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -486,6 +473,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -534,6 +524,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -558,6 +551,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -700,17 +696,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: manage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: view</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Production Order Module</portal_type>
  <title>Production Orders</title>
diff --git a/bt5/erp5_mrp/ModuleTemplateItem/production_packing_list_module.xml b/bt5/erp5_mrp/ModuleTemplateItem/production_packing_list_module.xml
index de151c901d1ab00286f8edd6483fb55288f19bf9..a34999400eeadc2f7c9703e3a4c0d9846ccc9d2b 100644
--- a/bt5/erp5_mrp/ModuleTemplateItem/production_packing_list_module.xml
+++ b/bt5/erp5_mrp/ModuleTemplateItem/production_packing_list_module.xml
@@ -224,16 +224,11 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -244,7 +239,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +273,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,7 +290,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +308,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -394,10 +382,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -453,6 +437,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -486,6 +473,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -534,6 +524,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -558,6 +551,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -700,17 +696,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: manage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: view</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Production Packing List Module</portal_type>
  <title>Production Packing Lists</title>
diff --git a/bt5/erp5_mrp/ModuleTemplateItem/production_report_module.xml b/bt5/erp5_mrp/ModuleTemplateItem/production_report_module.xml
index 8afb79df49f785b37523b0553f3ddc3a9ff91d24..a8473e06f5985570e8015c248dff7a0ef494bab7 100644
--- a/bt5/erp5_mrp/ModuleTemplateItem/production_report_module.xml
+++ b/bt5/erp5_mrp/ModuleTemplateItem/production_report_module.xml
@@ -224,16 +224,11 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -244,7 +239,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +273,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,7 +290,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +308,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -394,10 +382,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -453,6 +437,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -486,6 +473,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -534,6 +524,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -558,6 +551,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -700,17 +696,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: manage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: view</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Production Report Module</portal_type>
  <title>Production Reports</title>
diff --git a/bt5/erp5_mrp/ModuleTemplateItem/supply_chain_module.xml b/bt5/erp5_mrp/ModuleTemplateItem/supply_chain_module.xml
index 6e076f03c71d48e8194af0cec03fdf526e889813..205de41c5a17f7ed0d395e6c7e45e623620645bd 100644
--- a/bt5/erp5_mrp/ModuleTemplateItem/supply_chain_module.xml
+++ b/bt5/erp5_mrp/ModuleTemplateItem/supply_chain_module.xml
@@ -224,16 +224,11 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -244,7 +239,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +273,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,7 +290,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +308,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -394,10 +382,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -453,6 +437,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -486,6 +473,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -534,6 +524,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -558,6 +551,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -700,17 +696,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: manage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>ZopeProfiler: view</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Supply Chain Module</portal_type>
  <title>Supply Chains</title>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_packing_list_builder.xml b/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_packing_list_builder.xml
index ee0d493ee0bb43fc88c51adde0e9dbe1ddbe960c..8a45cdcbabd107669a4519d55d3227b73ec0e265 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_packing_list_builder.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_packing_list_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_report_builder.xml b/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_report_builder.xml
index b10d56ab0692220a481fab426e683ca47330fe1d..2709679db4f428c7abd92b7b214909c81777d7e5 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_report_builder.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_report_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_category_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_category_tester.xml
index c5985da46893328d618eac82a9a1a58fd3f88a68..4975cd99744d8831b1c6fedbf44fe1b0760ebfcd 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_category_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_category_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.CategoryDivergenceTester</string>
-          <string>CategoryDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_property_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_property_tester.xml
index 407698622ec84f2b775d79243dabecac775737ca..ac84343e153d12fd20c2d9f6655098596c9be9ff 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_property_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_property_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.PropertyDivergenceTester</string>
-          <string>PropertyDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_quantity_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_quantity_tester.xml
index afe78d6c2ebe8bb9f155e5914e9928fa44f7efae..8d3e60c4521f58f3fbdfccb4f14f233862846140 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_quantity_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/default_quantity_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_category_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_category_tester.xml
index c5985da46893328d618eac82a9a1a58fd3f88a68..4975cd99744d8831b1c6fedbf44fe1b0760ebfcd 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_category_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_category_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.CategoryDivergenceTester</string>
-          <string>CategoryDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_property_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_property_tester.xml
index 407698622ec84f2b775d79243dabecac775737ca..ac84343e153d12fd20c2d9f6655098596c9be9ff 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_property_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_property_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.PropertyDivergenceTester</string>
-          <string>PropertyDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_quantity_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_quantity_tester.xml
index afe78d6c2ebe8bb9f155e5914e9928fa44f7efae..8d3e60c4521f58f3fbdfccb4f14f233862846140 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule/default_quantity_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_category_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_category_tester.xml
index c5985da46893328d618eac82a9a1a58fd3f88a68..4975cd99744d8831b1c6fedbf44fe1b0760ebfcd 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_category_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_category_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.CategoryDivergenceTester</string>
-          <string>CategoryDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_property_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_property_tester.xml
index 407698622ec84f2b775d79243dabecac775737ca..ac84343e153d12fd20c2d9f6655098596c9be9ff 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_property_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_property_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.PropertyDivergenceTester</string>
-          <string>PropertyDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_quantity_tester.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_quantity_tester.xml
index afe78d6c2ebe8bb9f155e5914e9928fa44f7efae..8d3e60c4521f58f3fbdfccb4f14f233862846140 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_quantity_tester.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule/default_quantity_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Cell.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Cell.xml
index 5eb325f4de6346cf2927f7fab982bd0e4ca52fdd..6e9da16912739584a93a028bbb41c6db463543ef 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Cell.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%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_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Line.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Line.xml
index b7ce9df1c6d1125ce81a75bb3e873fe65738aa38..0caba0daee51cce1577ee5a9cddab842bed89f87 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Line.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Line.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_mrp/PortalTypeTemplateItem/portal_types/Production%20Order.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order.xml
index 6ca8ff38128b341d69ed078c647033b28f1cf490..290212c6f07bc18d4bf28e6f13bccc63cf647f2b 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order.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_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Cell.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Cell.xml
index 7af1392475d12ff11597d0ea069340c6f12e1ed1..dcdbb1606b5a90c3eb7092f64edb9890e5d4aabb 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%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_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Line.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Line.xml
index f65142967b6e4fb09a9f4d5deeef645961f9e09d..b54c0a34d8edb8ef2d6c0cd7878043f9006f6419 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Line.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List%20Line.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_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List.xml
index b20c127ca2e592f484d2d1ba70a15582a0709def..f0005514d0f586df5ff500cacc1d7514d2f0010a 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Packing%20List.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_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Cell.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Cell.xml
index 4c860b6eca1c1e667d5c0f7f709c4e7cb34a4fa3..f82b767d024f45616e5bd7e033a30b22ee77c276 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Cell.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%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_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Line.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Line.xml
index e56551239bbb1b9be7d982fb5ded0d63f8f5c0a7..ea97a09d8ce058b11eac280c2465e1cdb10f6168 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Line.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Line.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_mrp/PortalTypeTemplateItem/portal_types/Production%20Report.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report.xml
index 43bc4afe089388c8320e634bad2a5ef64d782b2a..f510f20b67048226e02d59ad1e9e8f1ffa5711b4 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain%20Module.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain%20Module.xml
index bd7a59a31928e13ae0f1af15a4742493e66cdc08..6372b9f7c382fa9f6dd2944748338273e403173a 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain%20Module.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain%20Module.xml
@@ -95,14 +95,6 @@ be a problem).</string> </value>
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <tuple>
-                <string>module</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>group_list</string> </key>
             <value>
diff --git a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain.xml
index 442a9d4aafc05c079a2e7d792245e070b036a5c1..8843d1135122d4c4e344572b31f7a3f9ffbbddec 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Chain.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_mrp/PortalTypeTemplateItem/portal_types/Supply%20Link.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Link.xml
index b338775018df247cc5de57323134d544cb9534d4..a74cf8854c485eabcfd818dedb1f0165e08e80c3 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Link.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Link.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_mrp/PortalTypeTemplateItem/portal_types/Supply%20Node.xml b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Node.xml
index 313a2db74c38d60237747d2fa3c9a3b57d8286a2..325a5238a4734860431f02e3470e66e442dbf49d 100644
--- a/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Node.xml
+++ b/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Supply%20Node.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_mrp/SkinTemplateItem/portal_skins/erp5_mrp.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp.xml
index e1593934a30419b7acffab5c92e9ed47d488e8b8..36169add6ad3215071cc8acc9f5b551b655dbb6d 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml
index 1b94fee6e46032f90f82403047f145d6225cd436..aaf8af2a55b54adbb25a6b8035349aa8e67e103a 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
index ff154c235e5f0263d704dcc41279c2de4e11c0f2..61a92a25acb2a9547f8a2a15add5676bbc575935 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_getSupplyLinkList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_getSupplyLinkList.xml
index 76d8a46271eb71db94d44db7f2c7e6267ecb377c..b197ac350b427fcf0036a2e698a99a83572594f8 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_getSupplyLinkList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_getSupplyLinkList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderLine_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderLine_view.xml
index dfc04e1b4c73d348521e88997a30afd0b4e3f3cd..f2e8bc962388601e463a620b82b1a8fb782449c1 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderLine_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderModule_viewProductionOrderList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderModule_viewProductionOrderList.xml
index 7feddd213d2621b3a44c5e88a249ee0239f674d5..aa8c81dc54c0a25ccd8d4d0a31e07bdc87da2720 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderModule_viewProductionOrderList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderModule_viewProductionOrderList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_view.xml
index 632b1fcf8fee55c3e7408cb3d02d71065a2dfd57..0b2e841a4af88e2ae1cbeb13bfe279073b634e65 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
index aa680f919e66fdb71f7411f6a9f3cc18c53232f8..25455422020746d12c61b8fe81559d1cdfbcefc6 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -159,9 +156,11 @@ ORDER BY <dtml-var order_by_expression>\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingListModule_viewProductionPackingListList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingListModule_viewProductionPackingListList.xml
index d82b081ae8a80dd1daf3f5d6126d8d473bfdbfbb..789b3ae5e0d025d56e9d2f95d6963ddf8048465f 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingListModule_viewProductionPackingListList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingListModule_viewProductionPackingListList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_view.xml
index b8696d81f82aa96cab4aa731d8f69b4ef45a9b45..0305f33b491a6b729bd3897acc3072aa0855c290 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
index 21d20c3688b9a1a78657dc545882a617edb9cbe4..bfda2f04da972743e10e4c1145deffe89cf9e165 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList.xml
index fdf3230baefd36f7f4da2ce093f2205afdad07e4..cd437089a84c7d78368d74e1f5a961cae4103631 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view.xml
index b90a567683d8a9aeeeb9cb6fabeee308869704f6..83e3dedac49bc8d9d2eb7804fe4d5b8923667bc3 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChainModule_viewSupplyChainList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChainModule_viewSupplyChainList.xml
index a4a246306d8337afdac56d4d766789824daff8a2..1630be8268be084ce70afbd2be802ddd1c075883 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChainModule_viewSupplyChainList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChainModule_viewSupplyChainList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view.xml
index d7c59be417a5007d518a85b53acba0734e42a448..82b74231ab52ab383273ca8c6e3795744d34702c 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view/my_id.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view/my_id.xml
index 53535c4618d7607f02d74e5bd4e2d79313222bf5..c42bbd3544bb1af3d5bbcc8893c1091fbe043164 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view/my_id.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_view/my_id.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_viewSupplyNodeList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_viewSupplyNodeList.xml
index 16a77bbe3d4057dae4779105d810c8616c37ba89..a4b27da4873719deee09260ae0d1308b271f233b 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_viewSupplyNodeList.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyChain_viewSupplyNodeList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyLink_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyLink_view.xml
index 8c2bdfefe1d1fa1a728530954e956beeb55fed53..eba0f38852a75f1dfcead01d79b5b977e8e91950 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyLink_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyLink_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyNode_view.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyNode_view.xml
index 1114b9d6d7c92ac7ad11ad93e4b4a085231f17f2..61d5e0435bc0f6865131c15de491bd368d3bf0ba 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyNode_view.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SupplyNode_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml
index 9278422d797e73688e5478a7b176192a6183f5ce..e1d7c8e38d250e18cd36833561fa158f54859424 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
index d23135fd324ac53186a057075978adf3886fb97c..65f313199aa43cb103db72b832d48361123ff068 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow.xml
index 5ada64f98ed7fbae0d0fec2be4e9677df881114a..e51732130db40df62ebbdc4fbee29bf2f3998f4e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions.xml
index 7d8c51003b7e09d577b9ce4a374f51510b4e2ead..879a78b540f5742c1dc5bb51265c562252bdf194 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions/setVariationCategoryList.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions/setVariationCategoryList.xml
index bd260a8f56cb40fc6c34b36458d02e9ef2208658..807865d7f5b4ad3cd4b094cfb755b06205aae503 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions/setVariationCategoryList.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions/setVariationCategoryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts.xml
index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
index c9c55a04d7f041142a8fcdf05c370ece5f830914..dbef203627596412139540ff94dcde75beed2332 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/variables.xml
index db67387d4e62a7db68bbb9689238ba0824326e50..733d9ce458eebdbf2f511e03ef3d0831d9587ce9 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/variables.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/worklists.xml
index f4c2789633e196d41819670f25c55bac972e751a..3953ad0209bd0cd9a4f7c91ba6db81eebb08acfc 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/worklists.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow.xml
index f984c04ba257b1430dc9cf37a26dacfa21d6ae85..2568e21f80c33917775881f7e0d650bbdff31824 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts.xml
index c5f508543030030eff505ab63d3c20c5cc025219..34ddf5a001734e8adeeb683a0ecdabe0081b7926 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_appliedToRelatedMovement.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_appliedToRelatedMovement.xml
index 61da8c4246f66ad02adb9b5fcc5b0a79f62901d4..cd521662e6e7a0fd7b572cdb0e74569f02366b77 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_appliedToRelatedMovement.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_appliedToRelatedMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
index dc337061aaef6c29109ba563505bc8bb8e1a7274..9719387d2f7048fce255df15d5df754c6fcb8d0a 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
index f731f693d7026002758fc28089339d7e4c210c60..af98ce86646a0ab8834dadef0dc50cd4ddfa38e7 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states.xml
index 9653d814da20a701a5e9f1a05754d33743dab98c..ddb880987e566fb491155526af3ed27dbd2e12a7 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/auto_planned.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/auto_planned.xml
index 12e2233b7965c44a1ff2ca31dd599908f23925b3..60ab57c2b81d851a6c58e235c6a9cd5b2decb6ec 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/auto_planned.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/auto_planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/cancelled.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/cancelled.xml
index b6c52062acfc20c99866c11fa0c1bbed98195fd0..f3e97a7c1c108e1f429c3ed56ceede1942d32f40 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/cancelled.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/confirmed.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/confirmed.xml
index 8de2970b81b1aabff5a6ba0e15d693385b4def4c..ec463ce95c19edd85815622a73260b04fee3cba5 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/confirmed.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/draft.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/draft.xml
index 30490e58966623cbdc19126d2b16f47366f3a19a..4c9eddf770933643806083be02aa364b69348464 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/draft.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/ordered.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/ordered.xml
index 61070bcec27a3c5eaea0b670c2a3b42e9acfc3f3..ce0f003624108b159060d86ec0bd1e51557406df 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/ordered.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/ordered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/planned.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/planned.xml
index 2d9ac2c854746644e648feb985e75012db298538..0ec3ff9e9a9fd1622bee636255bc99c00861296a 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/planned.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/states/planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions.xml
index eec7ba7928f9db635db75d2d90bdbeeed6e5be55..eb34805c27a6fcb956f11553d6f94001e406b6c2 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/autoPlan.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/autoPlan.xml
index f78f0d3f891a6a5bcd4345ede2a3c5f893aa5a93..72fa3ec2788d68ccbc71bcea790b3c833a67b3dc 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/autoPlan.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/autoPlan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel.xml
index c58fd34c48108a8a0d16ea184fa929767b6cd972..04c6363a38b34a676d4750ead47465a7253dd4cd 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel_action.xml
index 8a8647a10e9299b1a21279ac26839da170f0c343..d809b204f80dadf79038570dced86c65288cfcf3 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm.xml
index b2170fb93d30502e869049a6d76d79c90f8d1a00..34b22186b82c2b1f6eb7ba306d48af59b4c42893 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm_action.xml
index e80720f168401c06ebba476c731e54c1af2bf996..24478338092032dd4388416cc311673fa1d43882 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/informDeliveryList.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/informDeliveryList.xml
index 977193c4f85174742bfd84af689ec79bf9d49225..ff09fee8ddfa3a2fde558cddbd78bda74e1ff61e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/informDeliveryList.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/informDeliveryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order.xml
index 528a79789810227cf4866736c637294bca277c52..31ef15f168329cc1aab9a571feee3ce347d1d013 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order_action.xml
index 8536f1f9f4e97f99b46ca21871bfcbdb9ae21c81..7007df5b28d8111cedbda809111e6214bdfcc1e6 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/order_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan.xml
index fd2a0b2c44bfb4c87f50e644641e5acbf0ac7014..c9c1e670bd7f5bec7da8834af6df838fb50fe4a1 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan_action.xml
index 9afb0c6eedd1ddcc3a5eeac4fa493edc6c3f3a74..2d0908720da947177a5c41b1ed0ca769d899c338 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/transitions/plan_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables.xml
index d36f9e73c8fa005ab1ca08bbee170225e2e30065..b436e9ccb1c627d6503364b8cad737a038a88443 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/action.xml
index e2d54b25d769b04e37fad3417d218ec035470e50..259c80afcf7f5b8cfa6e6c1352e83522f5961a8d 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml
index b81346a188e9d410bdc524bf29d71c14b6e862de..d61e0797ec015931e368116fdb67b856e4d98f32 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/comment.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/comment.xml
index 05ac72139e772a6566353292fdf25ffd7870648f..17628b77ae5aea3f45743d9ee0bcde2a8b4872fb 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/comment.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/history.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/history.xml
index 2a212275cf48864d8ac38320bcbe37629c8b1ff3..67134b997c7d876d50c99d06c5f1d80c87c20bad 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/history.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/portal_type.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/portal_type.xml
index aaacee8edcd299fe6ab0bd3dd34716495d200659..b989d55a5206bda55f7285f6d4561b1de376f73e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/portal_type.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/start_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/start_date.xml
index 44577058a48215e3f4f4f441d3fc2ceb7786b45b..c19f7c7a1500a51db2d3600a365cca4f8cd9ae7e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/start_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/stop_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/stop_date.xml
index b6d159025a92cdd9e2b4e133cbbb6e3d2aee6bbb..784b28d79c915fb56f0983d465db0ef5f8ee7d3b 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/stop_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/time.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/time.xml
index a3891299981e44f43071c0030f1069bcaa2edf33..60befb96fac5fc1e4dd6ed94c691e37bdfec6386 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/time.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/worklists.xml
index 055366cf24001b4dc67bce9e07d59b30ed034f02..13d4865218a5b8382537b280f330de9c1b8f4645 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/worklists.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow.xml
index a7f724d81a7017bebc712c9bfa6ec66010aa1f9c..67ded15a73276af769cb7a3974cb1f76e9112a72 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts.xml
index c5f508543030030eff505ab63d3c20c5cc025219..34ddf5a001734e8adeeb683a0ecdabe0081b7926 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
index 4f442833dab57532439af8f4c9d2bceb5d05a3e7..faad450e4e84d3e4db9a2517eb7a8f32f84176d8 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
index d8424f96cc9bf3d40b46769b4f012bfce6772d65..058ae06399f3fdf8695fab0787e713e75f413567 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
index 0b90790a35d9ac02cf483a436601d7fae7f034c6..df61ad0a20a7a1ab30923663c6458ffd6a355785 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_split.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_split.xml
index b879e4703e62984160dc129d887cd1332e37a508..a8f79241948deef9f81fb80d238089d2d2d547a2 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_split.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/scripts/PackingList_split.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states.xml
index 9653d814da20a701a5e9f1a05754d33743dab98c..ddb880987e566fb491155526af3ed27dbd2e12a7 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/building.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/building.xml
index ca35fe88d65fe5f8774338aa9d96235de1ea1b2c..fd9d6b607d26ada610eedef7edce7f98f9cbbd92 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/building.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/calculating.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/calculating.xml
index 2c8c208d1664e451330a0c7acbc26464cff54734..94cc50ea2520890c211984049cc87e9ed7948195 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/calculating.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/calculating.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/diverged.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/diverged.xml
index 9211c889145fe2a8cf9b03461349933f4e541aa4..ba69a7358a2189d26e68f70ff54d4f0dbbf1a009 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/diverged.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/diverged.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/draft.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/draft.xml
index 5a7fd7ac60d1976e7c92cc26c96d8ad67191e1ce..22218ae4c410a406cd7c877df137c8426f5b8ecc 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/draft.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solved.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solved.xml
index cca08f364f70df9a6defbc186768116cd27328b3..153818cce4c19c96c0875eab4668c5d1fc78425a 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solved.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solved.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solving.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solving.xml
index df1264240f3ffe4252c3b4c8abdbaf1805b530bd..1dc04270aa1543cd16e86fd05e17543d4248d16a 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solving.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/states/solving.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions.xml
index eec7ba7928f9db635db75d2d90bdbeeed6e5be55..eb34805c27a6fcb956f11553d6f94001e406b6c2 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision.xml
index b2edb445a0dab4fd5117a9516b177d08f00d217f..05442c969a04022615853f720d895df7a5be526b 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision_action.xml
index 4922534d70159eb7f271174f7ba496ab12407b51..e0eab6603e66f064c599d7049d7178c872ec1de8 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/accept_decision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision.xml
index 79b1a1a22d8798c21726d494b8dc5c3a908e679d..6fbefcf27a01dbc3d231b8c42b524f0233dcb58e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision_action.xml
index 7e0fdb227b24d30169ef45ac6b53fd5cfd936d2c..88d0b2d5a43d0c6a174cbd9577728e12516ffa60 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/adopt_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/calculate.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/calculate.xml
index 81bbc505c3acee009b05b7fe0faee400fda95f78..e4bcb8c7589ee7ecf6a15d466b68f4a021d4e7d6 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/calculate.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/calculate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/converge.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/converge.xml
index 389c4d21c1f419b6f3106397c9458970a9d9d35e..5fe67437fce34673f265201ca221d6a98e501fa7 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/converge.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/converge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/diverge.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/diverge.xml
index 12a504b4981ede66965e0b90cd55091c8a67f2e8..48816ec9c6867e1de45f451f3c89165a035cd69b 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/diverge.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/diverge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision.xml
index d4738e942966c0b09fcb20d8de23c076828e2d07..9468b87330a0eb30b0bff60f37aa972e7d1b92ad 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision_action.xml
index 39466caa9f57e36023788001835cf8af720d4d68..44d0c31245e4445eb5b0db3ed68a8636a61c8e87 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/split_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/start_building.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/start_building.xml
index 7638b58a62f8c68a13f504206b13ef6a98466e92..373fc045b22e7641840e4b5fb0cb620719641859 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/start_building.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/transitions/start_building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables.xml
index d36f9e73c8fa005ab1ca08bbee170225e2e30065..b436e9ccb1c627d6503364b8cad737a038a88443 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/action.xml
index e2d54b25d769b04e37fad3417d218ec035470e50..259c80afcf7f5b8cfa6e6c1352e83522f5961a8d 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/actor.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/actor.xml
index b81346a188e9d410bdc524bf29d71c14b6e862de..d61e0797ec015931e368116fdb67b856e4d98f32 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/comment.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/comment.xml
index 05ac72139e772a6566353292fdf25ffd7870648f..17628b77ae5aea3f45743d9ee0bcde2a8b4872fb 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/comment.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/history.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/history.xml
index 2a212275cf48864d8ac38320bcbe37629c8b1ff3..67134b997c7d876d50c99d06c5f1d80c87c20bad 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/history.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/portal_type.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/portal_type.xml
index aaacee8edcd299fe6ab0bd3dd34716495d200659..b989d55a5206bda55f7285f6d4561b1de376f73e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/portal_type.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/start_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/start_date.xml
index 44577058a48215e3f4f4f441d3fc2ceb7786b45b..c19f7c7a1500a51db2d3600a365cca4f8cd9ae7e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/start_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/stop_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/stop_date.xml
index b6d159025a92cdd9e2b4e133cbbb6e3d2aee6bbb..784b28d79c915fb56f0983d465db0ef5f8ee7d3b 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/stop_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/time.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/time.xml
index a3891299981e44f43071c0030f1069bcaa2edf33..60befb96fac5fc1e4dd6ed94c691e37bdfec6386 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/time.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/worklists.xml
index 055366cf24001b4dc67bce9e07d59b30ed034f02..13d4865218a5b8382537b280f330de9c1b8f4645 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/worklists.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_causality_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow.xml
index 41c9fdaa8654b416bbf7b1f02bf4e8d6a27b91af..ca1e86ef334ae6ae80c5b1f1eb90481d2d0580e8 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts.xml
index c5f508543030030eff505ab63d3c20c5cc025219..34ddf5a001734e8adeeb683a0ecdabe0081b7926 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
index 6d15afb3e4cd6fd1bdc727f4c5e57a20a2806355..3ddd41440bf9d3aff21a51791faf4b310a0024da 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states.xml
index 9653d814da20a701a5e9f1a05754d33743dab98c..ddb880987e566fb491155526af3ed27dbd2e12a7 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/cancelled.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/cancelled.xml
index 85fcd059a7844288e122b4d37ca32a3b05c454cb..c6cc8e339e886e3de77809bf656d2857c380cafa 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/cancelled.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/confirmed.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/confirmed.xml
index 2ce92a7155659201ab7c5777d96a5e7fb846e3de..3c02b69ba77bca6fbd498aef8435e8e8dc14a02f 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/confirmed.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/delivered.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/delivered.xml
index e740ff45e70d37ec54c7aba05bfc48484d00b56c..41bbd571ef2e98f9140ffd0485776286201a2d3c 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/delivered.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/draft.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/draft.xml
index a1a5dde4160157463e6ab74793318a79f8392487..42b0c0a3e093a58d6238da2c00b67761df0a76aa 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/draft.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/ready.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/ready.xml
index 21b7d6e1130184a312d46e64b5166bc99915718f..6e2608bc820059b56258caf6a3376a25ae2b9ac3 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/ready.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/ready.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/started.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/started.xml
index 0f05ff5389a9c87886f8227502d1be70929edbec..6fcf412533122e5a641df0e8046d028964390600 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/started.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/started.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/stopped.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/stopped.xml
index f4fd402127479571a0801ae19169c529605a13d1..975cc1fb514a3202b19c4c22931fc50f3ae98745 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/stopped.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/states/stopped.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions.xml
index eec7ba7928f9db635db75d2d90bdbeeed6e5be55..eb34805c27a6fcb956f11553d6f94001e406b6c2 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel.xml
index 28b6c83c1ca164f84c1e75dd17c7a6fb777f3922..e1ca97937eccc62055c35c48cae3ae0f7d95b4d3 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel_action.xml
index 8a8647a10e9299b1a21279ac26839da170f0c343..d809b204f80dadf79038570dced86c65288cfcf3 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm.xml
index 00cef70bbedbffc795b2021e9b76389bc3ac0127..5811de9fb53651894a421331a4610f2027558053 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm_action.xml
index e80720f168401c06ebba476c731e54c1af2bf996..24478338092032dd4388416cc311673fa1d43882 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver.xml
index 3eeba3f51ffd635c23e2d2160d043fbff4ed14ca..8f03c1ab44aba2daa17647781321a3d5abbb41bc 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver_action.xml
index ea75ea6a81baa22ec374f8fe9315189020b0880b..b02ad9ea4c81c0729dc97f331b00aa09c8e1b24d 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/deliver_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready.xml
index 44adfbb21e829876b3da0978dd91985f2607c9f7..0f6eaf76d30e4918830664d9ba143dcd6b6f3714 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready_action.xml
index 12cee4d0eb3e0482ba7b1e7b1512b048913aa670..bfce30df0902d7a9ef610fef14630b1ee2d08274 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/set_ready_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start.xml
index 0a789f067ee1c16bd780d813688660e563dff76a..a934122ea9e551ed607bdb40b8e56ba5e0018713 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start_action.xml
index a678fea810b12225cdfc4139e7a7056eebc7d758..5cd77c4b334d23d585d56509c17de78a32446958 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/start_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop.xml
index bfeb37c774481c4a078c56ecb09e69355c593d79..c86214409f6abdb58f56aabc98ba3f84ba23b1a0 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop_action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop_action.xml
index db374dbff9e69658e748c29c25ead3a98c82a396..dad1448eed0dcd48119316400a0313ec31f75725 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/transitions/stop_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables.xml
index d36f9e73c8fa005ab1ca08bbee170225e2e30065..b436e9ccb1c627d6503364b8cad737a038a88443 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/action.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/action.xml
index e2d54b25d769b04e37fad3417d218ec035470e50..259c80afcf7f5b8cfa6e6c1352e83522f5961a8d 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/action.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml
index b81346a188e9d410bdc524bf29d71c14b6e862de..d61e0797ec015931e368116fdb67b856e4d98f32 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/comment.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/comment.xml
index 05ac72139e772a6566353292fdf25ffd7870648f..17628b77ae5aea3f45743d9ee0bcde2a8b4872fb 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/comment.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/history.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/history.xml
index 2a212275cf48864d8ac38320bcbe37629c8b1ff3..67134b997c7d876d50c99d06c5f1d80c87c20bad 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/history.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/portal_type.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/portal_type.xml
index aaacee8edcd299fe6ab0bd3dd34716495d200659..b989d55a5206bda55f7285f6d4561b1de376f73e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/portal_type.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/start_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/start_date.xml
index 44577058a48215e3f4f4f441d3fc2ceb7786b45b..c19f7c7a1500a51db2d3600a365cca4f8cd9ae7e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/start_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/stop_date.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/stop_date.xml
index b6d159025a92cdd9e2b4e133cbbb6e3d2aee6bbb..784b28d79c915fb56f0983d465db0ef5f8ee7d3b 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/stop_date.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/time.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/time.xml
index a3891299981e44f43071c0030f1069bcaa2edf33..60befb96fac5fc1e4dd6ed94c691e37bdfec6386 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/time.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists.xml
index 055366cf24001b4dc67bce9e07d59b30ed034f02..13d4865218a5b8382537b280f330de9c1b8f4645 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 2ebc6516c7df177c819b752dfac7b5ce5064189f..f0b5c72cad2a31240e128db4bc833e782855f796 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-56
\ No newline at end of file
+57
\ No newline at end of file
diff --git a/bt5/erp5_mrp/bt/template_catalog_datetime_key_list b/bt5/erp5_mrp/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_mrp/bt/template_catalog_local_role_key_list b/bt5/erp5_mrp/bt/template_catalog_local_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_mrp/bt/template_catalog_role_key_list b/bt5/erp5_mrp/bt/template_catalog_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_mrp/bt/template_catalog_scriptable_key_list b/bt5/erp5_mrp/bt/template_catalog_scriptable_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391