From f9843e8364d5d1113b1e81668e37ed3908508604 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Fri, 29 Feb 2008 17:03:00 +0000
Subject: [PATCH] Update to last XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19633 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../history_view.xml                          | 14 ++----
 .../Production%20Order%20Cell/metadata.xml    | 14 ++----
 .../Production%20Order%20Cell/print.xml       | 14 ++----
 .../Production%20Order%20Cell/view.xml        | 14 ++----
 .../Production%20Order%20Line/history.xml     | 14 ++----
 .../Production%20Order%20Line/metadata.xml    | 14 ++----
 .../Production%20Order%20Line/price_view.xml  | 21 +++-----
 .../Production%20Order%20Line/print.xml       | 14 ++----
 .../quantity_view.xml                         | 21 +++-----
 .../Production%20Order%20Line/view.xml        | 14 ++----
 .../csv_export.xml                            | 14 ++----
 .../import_csv.xml                            | 14 ++----
 .../Production%20Order%20Module/list_ui.xml   | 14 ++----
 .../Production%20Order%20Module/print.xml     | 14 ++----
 .../Production%20Order%20Module/search.xml    | 14 ++----
 .../Production%20Order%20Module/sort_on.xml   | 14 ++----
 .../Production%20Order%20Module/view.xml      | 14 ++----
 .../Production%20Order%20Rule/history.xml     | 14 ++----
 .../Production%20Order%20Rule/metadata.xml    | 14 ++----
 .../Production%20Order%20Rule/print.xml       | 14 ++----
 .../Production%20Order%20Rule/view.xml        | 14 ++----
 .../Production%20Order/history.xml            | 14 ++----
 ...ump_to_related_production_packing_list.xml | 14 ++----
 .../jump_to_related_production_report.xml     | 14 ++----
 .../Production%20Order/metadata.xml           | 14 ++----
 .../Production%20Order/payment_condition.xml  | 14 ++----
 .../portal_types/Production%20Order/print.xml | 14 ++----
 .../Production%20Order/profile_view.xml       | 14 ++----
 .../portal_types/Production%20Order/view.xml  | 14 ++----
 .../Production%20Order/view_discount.xml      | 14 ++----
 .../history_view.xml                          | 14 ++----
 .../metadata.xml                              | 14 ++----
 .../print.xml                                 | 14 ++----
 .../view.xml                                  | 14 ++----
 .../history.xml                               | 14 ++----
 .../metadata.xml                              | 14 ++----
 .../option_view.xml                           | 21 +++-----
 .../print.xml                                 | 14 ++----
 .../quantity_view.xml                         | 21 +++-----
 .../view.xml                                  | 14 ++----
 .../view_price.xml                            | 21 +++-----
 .../csv_export.xml                            | 14 ++----
 .../import_csv.xml                            | 14 ++----
 .../list_ui.xml                               | 14 ++----
 .../print.xml                                 | 14 ++----
 .../search.xml                                | 14 ++----
 .../sort_on.xml                               | 14 ++----
 .../view.xml                                  | 14 ++----
 .../Production%20Packing%20List/history.xml   | 14 ++----
 .../Production%20Packing%20List/metadata.xml  | 14 ++----
 .../Production%20Packing%20List/print.xml     | 14 ++----
 .../Production%20Packing%20List/view.xml      | 14 ++----
 .../history_view.xml                          | 14 ++----
 .../Production%20Report%20Cell/metadata.xml   | 14 ++----
 .../Production%20Report%20Cell/print.xml      | 14 ++----
 .../Production%20Report%20Cell/view.xml       | 14 ++----
 .../Production%20Report%20Line/history.xml    | 14 ++----
 .../Production%20Report%20Line/metadata.xml   | 14 ++----
 .../option_view.xml                           | 21 +++-----
 .../Production%20Report%20Line/print.xml      | 14 ++----
 .../quantity_view.xml                         | 21 +++-----
 .../Production%20Report%20Line/view.xml       | 14 ++----
 .../Production%20Report%20Line/view_price.xml | 21 +++-----
 .../csv_export.xml                            | 14 ++----
 .../import_csv.xml                            | 14 ++----
 .../Production%20Report%20Module/list_ui.xml  | 14 ++----
 .../Production%20Report%20Module/print.xml    | 14 ++----
 .../Production%20Report%20Module/search.xml   | 14 ++----
 .../Production%20Report%20Module/sort_on.xml  | 14 ++----
 .../Production%20Report%20Module/view.xml     | 14 ++----
 .../Production%20Report/history.xml           | 14 ++----
 .../Production%20Report/metadata.xml          | 14 ++----
 .../Production%20Report/print.xml             | 14 ++----
 .../portal_types/Production%20Report/view.xml | 14 ++----
 .../Supply%20Chain%20Module/csv_export.xml    | 14 ++----
 .../Supply%20Chain%20Module/list_ui.xml       | 14 ++----
 .../Supply%20Chain%20Module/print.xml         | 14 ++----
 .../Supply%20Chain%20Module/search.xml        | 14 ++----
 .../Supply%20Chain%20Module/sort_on.xml       | 14 ++----
 .../Supply%20Chain%20Module/view.xml          | 14 ++----
 .../Supply%20Chain/history_view.xml           | 14 ++----
 .../portal_types/Supply%20Chain/metadata.xml  | 14 ++----
 .../portal_types/Supply%20Chain/print.xml     | 14 ++----
 .../portal_types/Supply%20Chain/view.xml      | 14 ++----
 .../Supply%20Chain/view_supply_node.xml       | 14 ++----
 .../Supply%20Link/history_view.xml            | 14 ++----
 .../portal_types/Supply%20Link/metadata.xml   | 14 ++----
 .../portal_types/Supply%20Link/print.xml      | 14 ++----
 .../portal_types/Supply%20Link/view.xml       | 14 ++----
 .../Supply%20Node/history_view.xml            | 14 ++----
 .../portal_types/Supply%20Node/metadata.xml   | 14 ++----
 .../portal_types/Supply%20Node/print.xml      | 14 ++----
 .../portal_types/Supply%20Node/view.xml       | 14 ++----
 .../Transformation%20Rule/history.xml         | 14 ++----
 .../Transformation%20Rule/metadata.xml        | 14 ++----
 .../Transformation%20Rule/print.xml           | 14 ++----
 .../Transformation%20Rule/view.xml            | 14 ++----
 .../history.xml                               | 14 ++----
 .../metadata.xml                              | 14 ++----
 .../print.xml                                 | 14 ++----
 .../Transformation%20Sourcing%20Rule/view.xml | 14 ++----
 .../production_order_module.xml               | 49 +++++++------------
 .../production_packing_list_module.xml        | 49 +++++++------------
 .../production_report_module.xml              | 49 +++++++------------
 .../supply_chain_module.xml                   | 49 +++++++------------
 .../production_packing_list_builder.xml       |  7 +--
 .../production_report_builder.xml             |  7 +--
 .../default_category_tester.xml               |  7 +--
 .../default_property_tester.xml               |  7 +--
 .../default_quantity_tester.xml               |  7 +--
 .../default_category_tester.xml               |  7 +--
 .../default_property_tester.xml               |  7 +--
 .../default_quantity_tester.xml               |  7 +--
 .../default_category_tester.xml               |  7 +--
 .../default_property_tester.xml               |  7 +--
 .../default_quantity_tester.xml               |  7 +--
 .../Production%20Order%20Cell.xml             |  7 +--
 .../Production%20Order%20Line.xml             |  7 +--
 .../portal_types/Production%20Order.xml       |  7 +--
 .../Production%20Packing%20List%20Cell.xml    |  7 +--
 .../Production%20Packing%20List%20Line.xml    |  7 +--
 .../Production%20Packing%20List.xml           |  7 +--
 .../Production%20Report%20Cell.xml            |  7 +--
 .../Production%20Report%20Line.xml            |  7 +--
 .../portal_types/Production%20Report.xml      |  7 +--
 .../portal_types/Supply%20Chain%20Module.xml  |  8 ---
 .../portal_types/Supply%20Chain.xml           |  7 +--
 .../portal_types/Supply%20Link.xml            |  7 +--
 .../portal_types/Supply%20Node.xml            |  7 +--
 .../portal_skins/erp5_mrp.xml                 |  7 +--
 .../erp5_mrp/ProductionDelivery_confirm.xml   |  7 +--
 ...ProductionDelivery_copyOrderProperties.xml |  7 +--
 .../ProductionDelivery_getSupplyLinkList.xml  |  7 +--
 .../erp5_mrp/ProductionOrderLine_view.xml     |  7 +--
 ...ionOrderModule_viewProductionOrderList.xml |  7 +--
 .../erp5_mrp/ProductionOrder_view.xml         |  7 +--
 .../ProductionOrder_zSelectMovement.xml       | 13 +++--
 ...stModule_viewProductionPackingListList.xml |  7 +--
 .../erp5_mrp/ProductionPackingList_view.xml   |  7 +--
 .../ProductionReportLine_asCellRange.xml      |  7 +--
 ...nReportModule_viewProductionReportList.xml |  7 +--
 .../erp5_mrp/ProductionReport_view.xml        |  7 +--
 .../SupplyChainModule_viewSupplyChainList.xml |  7 +--
 .../erp5_mrp/SupplyChain_view.xml             |  7 +--
 .../erp5_mrp/SupplyChain_view/my_id.xml       |  7 +--
 .../SupplyChain_viewSupplyNodeList.xml        |  7 +--
 .../portal_skins/erp5_mrp/SupplyLink_view.xml |  7 +--
 .../portal_skins/erp5_mrp/SupplyNode_view.xml |  7 +--
 .../TransformationRule_selectMovement.xml     |  7 +--
 ...nsformationSourcingRule_selectMovement.xml |  7 +--
 .../production_matrix_workflow.xml            |  7 +--
 .../interactions.xml                          |  7 +--
 .../interactions/setVariationCategoryList.xml |  7 +--
 .../production_matrix_workflow/scripts.xml    |  7 +--
 .../scripts/DeliveryLine_updateCellRange.xml  |  7 +--
 .../production_matrix_workflow/variables.xml  |  7 +--
 .../production_matrix_workflow/worklists.xml  |  7 +--
 .../production_order_workflow.xml             |  7 +--
 .../production_order_workflow/scripts.xml     |  7 +--
 .../Order_appliedToRelatedMovement.xml        |  7 +--
 .../scripts/Order_buildPackingList.xml        |  7 +--
 .../scripts/Order_createOrderRule.xml         |  7 +--
 .../production_order_workflow/states.xml      |  7 +--
 .../states/auto_planned.xml                   |  7 +--
 .../states/cancelled.xml                      |  7 +--
 .../states/confirmed.xml                      |  7 +--
 .../states/draft.xml                          |  7 +--
 .../states/ordered.xml                        |  7 +--
 .../states/planned.xml                        |  7 +--
 .../production_order_workflow/transitions.xml |  7 +--
 .../transitions/autoPlan.xml                  |  7 +--
 .../transitions/cancel.xml                    |  7 +--
 .../transitions/cancel_action.xml             |  7 +--
 .../transitions/confirm.xml                   |  7 +--
 .../transitions/confirm_action.xml            |  7 +--
 .../transitions/informDeliveryList.xml        |  7 +--
 .../transitions/order.xml                     |  7 +--
 .../transitions/order_action.xml              |  7 +--
 .../transitions/plan.xml                      |  7 +--
 .../transitions/plan_action.xml               |  7 +--
 .../production_order_workflow/variables.xml   |  7 +--
 .../variables/action.xml                      |  7 +--
 .../variables/actor.xml                       |  7 +--
 .../variables/comment.xml                     |  7 +--
 .../variables/history.xml                     |  7 +--
 .../variables/portal_type.xml                 |  7 +--
 .../variables/start_date.xml                  |  7 +--
 .../variables/stop_date.xml                   |  7 +--
 .../variables/time.xml                        |  7 +--
 .../production_order_workflow/worklists.xml   |  7 +--
 ...uction_packing_list_causality_workflow.xml |  7 +--
 .../scripts.xml                               |  7 +--
 .../scripts/PackingList_acceptDecision.xml    |  7 +--
 .../scripts/PackingList_adoptPrevision.xml    |  7 +--
 ...ckingList_callSplitPrevisionTransition.xml |  7 +--
 .../scripts/PackingList_split.xml             |  7 +--
 .../states.xml                                |  7 +--
 .../states/building.xml                       |  7 +--
 .../states/calculating.xml                    |  7 +--
 .../states/diverged.xml                       |  7 +--
 .../states/draft.xml                          |  7 +--
 .../states/solved.xml                         |  7 +--
 .../states/solving.xml                        |  7 +--
 .../transitions.xml                           |  7 +--
 .../transitions/accept_decision.xml           |  7 +--
 .../transitions/accept_decision_action.xml    |  7 +--
 .../transitions/adopt_prevision.xml           |  7 +--
 .../transitions/adopt_prevision_action.xml    |  7 +--
 .../transitions/calculate.xml                 |  7 +--
 .../transitions/converge.xml                  |  7 +--
 .../transitions/diverge.xml                   |  7 +--
 .../transitions/split_prevision.xml           |  7 +--
 .../transitions/split_prevision_action.xml    |  7 +--
 .../transitions/start_building.xml            |  7 +--
 .../variables.xml                             |  7 +--
 .../variables/action.xml                      |  7 +--
 .../variables/actor.xml                       |  7 +--
 .../variables/comment.xml                     |  7 +--
 .../variables/history.xml                     |  7 +--
 .../variables/portal_type.xml                 |  7 +--
 .../variables/start_date.xml                  |  7 +--
 .../variables/stop_date.xml                   |  7 +--
 .../variables/time.xml                        |  7 +--
 .../worklists.xml                             |  7 +--
 .../production_packing_list_workflow.xml      |  7 +--
 .../scripts.xml                               |  7 +--
 .../scripts/PackingList_updateAppliedRule.xml |  7 +--
 .../states.xml                                |  7 +--
 .../states/cancelled.xml                      |  7 +--
 .../states/confirmed.xml                      |  7 +--
 .../states/delivered.xml                      |  7 +--
 .../states/draft.xml                          |  7 +--
 .../states/ready.xml                          |  7 +--
 .../states/started.xml                        |  7 +--
 .../states/stopped.xml                        |  7 +--
 .../transitions.xml                           |  7 +--
 .../transitions/cancel.xml                    |  7 +--
 .../transitions/cancel_action.xml             |  7 +--
 .../transitions/confirm.xml                   |  7 +--
 .../transitions/confirm_action.xml            |  7 +--
 .../transitions/deliver.xml                   |  7 +--
 .../transitions/deliver_action.xml            |  7 +--
 .../transitions/set_ready.xml                 |  7 +--
 .../transitions/set_ready_action.xml          |  7 +--
 .../transitions/start.xml                     |  7 +--
 .../transitions/start_action.xml              |  7 +--
 .../transitions/stop.xml                      |  7 +--
 .../transitions/stop_action.xml               |  7 +--
 .../variables.xml                             |  7 +--
 .../variables/action.xml                      |  7 +--
 .../variables/actor.xml                       |  7 +--
 .../variables/comment.xml                     |  7 +--
 .../variables/history.xml                     |  7 +--
 .../variables/portal_type.xml                 |  7 +--
 .../variables/start_date.xml                  |  7 +--
 .../variables/stop_date.xml                   |  7 +--
 .../variables/time.xml                        |  7 +--
 .../worklists.xml                             |  7 +--
 bt5/erp5_mrp/bt/revision                      |  2 +-
 .../bt/template_catalog_datetime_key_list     |  0
 .../bt/template_catalog_local_role_key_list   |  0
 .../bt/template_catalog_role_key_list         |  0
 .../bt/template_catalog_scriptable_key_list   |  0
 263 files changed, 797 insertions(+), 1949 deletions(-)
 create mode 100644 bt5/erp5_mrp/bt/template_catalog_datetime_key_list
 create mode 100644 bt5/erp5_mrp/bt/template_catalog_local_role_key_list
 create mode 100644 bt5/erp5_mrp/bt/template_catalog_role_key_list
 create mode 100644 bt5/erp5_mrp/bt/template_catalog_scriptable_key_list

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 369ed718a6..64e0c954df 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 55d016dda3..aaf39a2297 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 6ddff8ee35..313d4b2fe9 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 f4f1655d61..afee9c3694 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 2f52fa6256..cc2e9d15d1 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 b0646266af..00f6263741 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 42d7040078..bbf4784a6d 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 dc675d629f..b57589802a 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 df3dee7964..5608aea01b 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 c68b13d7c6..3cfe95721f 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 319f5c5970..66954514c3 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 6ce6cc1220..caf335eb14 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 b5e9ee59ec..f7b0792cef 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 844f84b37f..99880f65ba 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 a2ac1bf3b6..85a3957cd8 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 7967a23223..cd08777edc 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 919165fa3e..49b94c845c 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 f871a92fc4..d738ed1bb6 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 97da81ac4e..16c8d462c9 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 7967a23223..cd08777edc 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 52701be79c..5baec95502 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 ab1c6518fc..9dc2d9e046 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 919165fa3e..49b94c845c 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 42a1e682c9..ae32b6fcf8 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 e64988d889..6f01d4baae 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 2a693e1fa3..4b5aedaefe 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 8df4d719fe..f9be612172 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 50405be293..12a1fb9496 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 369ed718a6..64e0c954df 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 55d016dda3..aaf39a2297 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 7967a23223..cd08777edc 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 919165fa3e..49b94c845c 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 6aef8025ad..3b99753591 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 e64988d889..6f01d4baae 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 42d7040078..bbf4784a6d 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 18133b29c7..33546510c9 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 11c5591182..0d3c46b9fc 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 df3dee7964..5608aea01b 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 c68b13d7c6..3cfe95721f 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 319f5c5970..66954514c3 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 6ce6cc1220..caf335eb14 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 b5e9ee59ec..f7b0792cef 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 844f84b37f..99880f65ba 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 475bf91a79..4492eaf693 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 d54a254eb9..17e1d3b1bb 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 e08c5afab6..48bf3691e3 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 369ed718a6..64e0c954df 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 55d016dda3..aaf39a2297 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 7967a23223..cd08777edc 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 919165fa3e..49b94c845c 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 6aef8025ad..3b99753591 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 e64988d889..6f01d4baae 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 42d7040078..bbf4784a6d 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 18133b29c7..33546510c9 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 11c5591182..0d3c46b9fc 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 df3dee7964..5608aea01b 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 c68b13d7c6..3cfe95721f 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 319f5c5970..66954514c3 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 6ce6cc1220..caf335eb14 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 b5e9ee59ec..f7b0792cef 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 844f84b37f..99880f65ba 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 28e1418999..a7fbb9faa6 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 d54a254eb9..17e1d3b1bb 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 421b805e5e..96dfd9b86b 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 df3dee7964..5608aea01b 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 319f5c5970..66954514c3 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 6ce6cc1220..caf335eb14 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 844ad76c4c..9c11a1f3ae 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 844f84b37f..99880f65ba 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 8b129956f5..8b89b71fcd 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 9bce0b5a03..eb1025ab43 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 65fccc7506..d99840455b 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 760f443706..485cc99472 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 6784ffcff2..b419035bbe 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 94cc50c2dc..b63e621a0b 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 369ed718a6..64e0c954df 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 9fc9909bc5..e9f721c0cd 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 369ed718a6..64e0c954df 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 273fb9cb9c..8b71d32e75 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 6ce6cc1220..caf335eb14 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 e56cf64b52..73bae9f1cf 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 7967a23223..cd08777edc 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 919165fa3e..49b94c845c 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 f871a92fc4..d738ed1bb6 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 97da81ac4e..16c8d462c9 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 7967a23223..cd08777edc 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 919165fa3e..49b94c845c 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 f871a92fc4..d738ed1bb6 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 97da81ac4e..16c8d462c9 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 fc097a81e5..8a648fb107 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 de151c901d..a34999400e 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 8afb79df49..a8473e06f5 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 6e076f03c7..205de41c5a 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 ee0d493ee0..8a45cdcbab 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 b10d56ab06..2709679db4 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 c5985da468..4975cd9974 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 407698622e..ac84343e15 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 afe78d6c2e..8d3e60c452 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 c5985da468..4975cd9974 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 407698622e..ac84343e15 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 afe78d6c2e..8d3e60c452 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 c5985da468..4975cd9974 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 407698622e..ac84343e15 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 afe78d6c2e..8d3e60c452 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 5eb325f4de..6e9da16912 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 b7ce9df1c6..0caba0daee 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 6ca8ff3812..290212c6f0 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 7af1392475..dcdbb1606b 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 f65142967b..b54c0a34d8 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 b20c127ca2..f0005514d0 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 4c860b6eca..f82b767d02 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 e56551239b..ea97a09d8c 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 43bc4afe08..f510f20b67 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 bd7a59a319..6372b9f7c3 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 442a9d4aaf..8843d11351 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 b338775018..a74cf8854c 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 313a2db74c..325a5238a4 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 e1593934a3..36169add6a 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 1b94fee6e4..aaf8af2a55 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 ff154c235e..61a92a25ac 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 76d8a46271..b197ac350b 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 dfc04e1b4c..f2e8bc9623 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 7feddd213d..aa8c81dc54 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 632b1fcf8f..0b2e841a4a 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 aa680f919e..2545542202 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 d82b081ae8..789b3ae5e0 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 b8696d81f8..0305f33b49 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 21d20c3688..bfda2f04da 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 fdf3230bae..cd437089a8 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 b90a567683..83e3dedac4 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 a4a246306d..1630be8268 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 d7c59be417..82b74231ab 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 53535c4618..c42bbd3544 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 16a77bbe3d..a4b27da487 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 8c2bdfefe1..eba0f38852 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 1114b9d6d7..61d5e0435b 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 9278422d79..e1d7c8e38d 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 d23135fd32..65f313199a 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 5ada64f98e..e51732130d 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 7d8c51003b..879a78b540 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 bd260a8f56..807865d7f5 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 01ba35bf25..66683dde04 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 c9c55a04d7..dbef203627 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 db67387d4e..733d9ce458 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 f4c2789633..3953ad0209 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 f984c04ba2..2568e21f80 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 c5f5085430..34ddf5a001 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 61da8c4246..cd521662e6 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 dc337061aa..9719387d2f 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 f731f693d7..af98ce8664 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 9653d814da..ddb880987e 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 12e2233b79..60ab57c2b8 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 b6c52062ac..f3e97a7c1c 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 8de2970b81..ec463ce95c 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 30490e5896..4c9eddf770 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 61070bcec2..ce0f003624 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 2d9ac2c854..0ec3ff9e9a 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 eec7ba7928..eb34805c27 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 f78f0d3f89..72fa3ec278 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 c58fd34c48..04c6363a38 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 8a8647a10e..d809b204f8 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 b2170fb93d..34b22186b8 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 e80720f168..2447833809 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 977193c4f8..ff09fee8dd 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 528a797898..31ef15f168 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 8536f1f9f4..7007df5b28 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 fd2a0b2c44..c9c1e670bd 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 9afb0c6eed..2d0908720d 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 d36f9e73c8..b436e9ccb1 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 e2d54b25d7..259c80afcf 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 b81346a188..d61e0797ec 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 05ac72139e..17628b77ae 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 2a212275cf..67134b997c 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 aaacee8edc..b989d55a52 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 44577058a4..c19f7c7a15 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 b6d159025a..784b28d79c 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 a389129998..60befb96fa 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 055366cf24..13d4865218 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 a7f724d81a..67ded15a73 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 c5f5085430..34ddf5a001 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 4f442833da..faad450e4e 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 d8424f96cc..058ae06399 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 0b90790a35..df61ad0a20 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 b879e4703e..a8f7924194 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 9653d814da..ddb880987e 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 ca35fe88d6..fd9d6b607d 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 2c8c208d16..94cc50ea25 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 9211c88914..ba69a7358a 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 5a7fd7ac60..22218ae4c4 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 cca08f364f..153818cce4 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 df1264240f..1dc04270aa 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 eec7ba7928..eb34805c27 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 b2edb445a0..05442c969a 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 4922534d70..e0eab6603e 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 79b1a1a22d..6fbefcf27a 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 7e0fdb227b..88d0b2d5a4 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 81bbc505c3..e4bcb8c758 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 389c4d21c1..5fe67437fc 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 12a504b498..48816ec9c6 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 d4738e9429..9468b87330 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 39466caa9f..44d0c31245 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 7638b58a62..373fc045b2 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 d36f9e73c8..b436e9ccb1 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 e2d54b25d7..259c80afcf 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 b81346a188..d61e0797ec 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 05ac72139e..17628b77ae 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 2a212275cf..67134b997c 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 aaacee8edc..b989d55a52 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 44577058a4..c19f7c7a15 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 b6d159025a..784b28d79c 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 a389129998..60befb96fa 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 055366cf24..13d4865218 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 41c9fdaa86..ca1e86ef33 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 c5f5085430..34ddf5a001 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 6d15afb3e4..3ddd41440b 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 9653d814da..ddb880987e 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 85fcd059a7..c6cc8e339e 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 2ce92a7155..3c02b69ba7 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 e740ff45e7..41bbd571ef 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 a1a5dde416..42b0c0a3e0 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 21b7d6e113..6e2608bc82 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 0f05ff5389..6fcf412533 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 f4fd402127..975cc1fb51 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 eec7ba7928..eb34805c27 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 28b6c83c1c..e1ca97937e 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 8a8647a10e..d809b204f8 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 00cef70bbe..5811de9fb5 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 e80720f168..2447833809 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 3eeba3f51f..8f03c1ab44 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 ea75ea6a81..b02ad9ea4c 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 44adfbb21e..0f6eaf76d3 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 12cee4d0eb..bfce30df09 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 0a789f067e..a934122ea9 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 a678fea810..5cd77c4b33 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 bfeb37c774..c86214409f 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 db374dbff9..dad1448eed 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 d36f9e73c8..b436e9ccb1 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 e2d54b25d7..259c80afcf 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 b81346a188..d61e0797ec 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 05ac72139e..17628b77ae 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 2a212275cf..67134b997c 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 aaacee8edc..b989d55a52 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 44577058a4..c19f7c7a15 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 b6d159025a..784b28d79c 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 a389129998..60befb96fa 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 055366cf24..13d4865218 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 2ebc6516c7..f0b5c72cad 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 0000000000..e69de29bb2
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 0000000000..e69de29bb2
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 0000000000..e69de29bb2
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 0000000000..e69de29bb2
-- 
2.30.9