From f175a8dd022e00099bb18f00aa4998b2419afda4 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Mon, 15 May 2006 09:49:41 +0000
Subject: [PATCH] Added maintainers.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7266 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../download.xml                              |   4 +-
 .../image_view.xml                            |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../csv_export.xml                            |   4 +-
 .../csv_import.xml                            |   4 +-
 .../Apparel%20Assortment%20Module/list_ui.xml |   4 +-
 .../Apparel%20Assortment%20Module/print.xml   |   4 +-
 .../Apparel%20Assortment%20Module/search.xml  |   4 +-
 .../Apparel%20Assortment%20Module/sort_on.xml |   4 +-
 .../Apparel%20Assortment%20Module/view.xml    |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../Apparel%20Assortment/history.xml          |   4 +-
 .../Apparel%20Assortment/metadata.xml         |   4 +-
 .../Apparel%20Assortment/print.xml            |   4 +-
 .../Apparel%20Assortment/view.xml             |   4 +-
 .../view_related_apparel_transformation.xml   |   4 +-
 .../Apparel%20Bath%20Module/csv_export.xml    |   4 +-
 .../Apparel%20Bath%20Module/import_csv.xml    |   4 +-
 .../Apparel%20Bath%20Module/list_ui.xml       |   4 +-
 .../Apparel%20Bath%20Module/print.xml         |   4 +-
 .../Apparel%20Bath%20Module/search.xml        |   4 +-
 .../Apparel%20Bath%20Module/sort_on.xml       |   4 +-
 .../Apparel%20Bath%20Module/view.xml          |   4 +-
 .../portal_types/Apparel%20Bath/history.xml   |   4 +-
 .../portal_types/Apparel%20Bath/metadata.xml  |   4 +-
 .../portal_types/Apparel%20Bath/print.xml     |   4 +-
 .../portal_types/Apparel%20Bath/view.xml      |   4 +-
 .../Apparel%20Cloth%20Module/csv_export.xml   |   4 +-
 .../Apparel%20Cloth%20Module/csv_import.xml   |   4 +-
 .../Apparel%20Cloth%20Module/list_ui.xml      |   4 +-
 .../Apparel%20Cloth%20Module/print.xml        |   4 +-
 .../Apparel%20Cloth%20Module/search.xml       |   4 +-
 .../Apparel%20Cloth%20Module/sort_on.xml      |   4 +-
 .../Apparel%20Cloth%20Module/view.xml         |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../Apparel%20Cloth/apparel_measure.xml       |   4 +-
 .../Apparel%20Cloth/development.xml           |   4 +-
 .../portal_types/Apparel%20Cloth/history.xml  |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 ...ted_apparel_model_morphology_variation.xml |   4 +-
 .../portal_types/Apparel%20Cloth/metadata.xml |   4 +-
 .../portal_types/Apparel%20Cloth/print.xml    |   4 +-
 .../portal_types/Apparel%20Cloth/view.xml     |   4 +-
 .../csv_import.xml                            |   4 +-
 .../cvs_export.xml                            |   4 +-
 .../list_ui.xml                               |   4 +-
 .../print.xml                                 |   4 +-
 .../search.xml                                |   4 +-
 .../sort_on.xml                               |   4 +-
 .../view.xml                                  |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../Apparel%20Colour%20Range/history.xml      |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 .../Apparel%20Colour%20Range/metadata.xml     |   4 +-
 .../Apparel%20Colour%20Range/print.xml        |   4 +-
 .../Apparel%20Colour%20Range/view.xml         |   4 +-
 .../csv_export.xml                            |   4 +-
 .../csv_import.xml                            |   4 +-
 .../Apparel%20Component%20Module/list_ui.xml  |   4 +-
 .../Apparel%20Component%20Module/print.xml    |   4 +-
 .../Apparel%20Component%20Module/search.xml   |   4 +-
 .../Apparel%20Component%20Module/sort_on.xml  |   4 +-
 .../Apparel%20Component%20Module/view.xml     |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../download.xml                              |   4 +-
 .../history_view.xml                          |   4 +-
 .../image_view.xml                            |   4 +-
 .../metadata.xml                              |   4 +-
 .../Apparel%20Component%20Variation/print.xml |   4 +-
 .../Apparel%20Component%20Variation/view.xml  |   4 +-
 .../Apparel%20Component/history.xml           |   4 +-
 .../Apparel%20Component/instruction_view.xml  |   4 +-
 .../Apparel%20Component/metadata.xml          |   4 +-
 .../Apparel%20Component/price_view.xml        |   4 +-
 .../Apparel%20Component/print.xml             |   4 +-
 .../portal_types/Apparel%20Component/view.xml |   4 +-
 .../view_flow_capacity.xml                    |   4 +-
 .../csv_export.xml                            |   4 +-
 .../csv_import.xml                            |   4 +-
 .../list_ui.xml                               |   4 +-
 .../Apparel%20Consumption%20Module/print.xml  |   4 +-
 .../Apparel%20Consumption%20Module/search.xml |   4 +-
 .../sort_on.xml                               |   4 +-
 .../Apparel%20Consumption%20Module/view.xml   |   4 +-
 .../Apparel%20Consumption/history.xml         |   4 +-
 .../Apparel%20Consumption/metadata.xml        |   4 +-
 .../Apparel%20Consumption/print.xml           |   4 +-
 .../Apparel%20Consumption/print_matrix.xml    |   4 +-
 .../Apparel%20Consumption/view.xml            |   4 +-
 .../Apparel%20Consumption/view_quantity.xml   |   4 +-
 .../download.xml                              |   4 +-
 .../history.xml                               |   4 +-
 .../image.xml                                 |   4 +-
 ...related_apparel_colour_range_variation.xml |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../csv_export.xml                            |   4 +-
 .../import_csv.xml                            |   4 +-
 .../list_ui.xml                               |   4 +-
 .../print.xml                                 |   4 +-
 .../search.xml                                |   4 +-
 .../sort_on.xml                               |   4 +-
 .../Apparel%20Fabric%20Item%20Module/view.xml |   4 +-
 .../Apparel%20Fabric%20Item/history.xml       |   4 +-
 .../Apparel%20Fabric%20Item/metadata.xml      |   4 +-
 .../Apparel%20Fabric%20Item/print.xml         |   4 +-
 .../Apparel%20Fabric%20Item/view.xml          |   4 +-
 .../Apparel%20Fabric%20Module/csv_export.xml  |   4 +-
 .../Apparel%20Fabric%20Module/import_csv.xml  |   4 +-
 .../Apparel%20Fabric%20Module/list_ui.xml     |   4 +-
 .../Apparel%20Fabric%20Module/print.xml       |   4 +-
 .../Apparel%20Fabric%20Module/search.xml      |   4 +-
 .../Apparel%20Fabric%20Module/sort_on.xml     |   4 +-
 .../Apparel%20Fabric%20Module/view.xml        |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../portal_types/Apparel%20Fabric/history.xml |   4 +-
 .../Apparel%20Fabric/instructions_view.xml    |   4 +-
 .../Apparel%20Fabric/metadata.xml             |   4 +-
 .../portal_types/Apparel%20Fabric/print.xml   |   4 +-
 .../portal_types/Apparel%20Fabric/view.xml    |   4 +-
 .../Apparel%20Fabric/view_composition.xml     |   4 +-
 .../Apparel%20Fabric/view_flow_capacity.xml   |   4 +-
 .../Apparel%20Fabric/view_price.xml           |   4 +-
 .../csv_export.xml                            |   4 +-
 .../csv_import.xml                            |   4 +-
 .../list_ui.xml                               |   4 +-
 .../Apparel%20Measurement%20Module/print.xml  |   4 +-
 .../Apparel%20Measurement%20Module/search.xml |   4 +-
 .../sort_on.xml                               |   4 +-
 .../Apparel%20Measurement%20Module/view.xml   |   4 +-
 .../customer_measure.xml                      |   4 +-
 .../Apparel%20Measurement/download.xml        |   4 +-
 .../Apparel%20Measurement/history.xml         |   4 +-
 .../Apparel%20Measurement/image.xml           |   4 +-
 .../jump_to_related_apparel_cloth.xml         |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 .../Apparel%20Measurement/metadata.xml        |   4 +-
 .../Apparel%20Measurement/print.xml           |   4 +-
 .../Apparel%20Measurement/view.xml            |   4 +-
 .../download.xml                              |   4 +-
 .../image_view.xml                            |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../Apparel%20Model%20Module/csv_export.xml   |   4 +-
 .../Apparel%20Model%20Module/csv_import.xml   |   4 +-
 .../Apparel%20Model%20Module/list_ui.xml      |   4 +-
 .../Apparel%20Model%20Module/print.xml        |   4 +-
 .../Apparel%20Model%20Module/search.xml       |   4 +-
 .../Apparel%20Model%20Module/sort_on.xml      |   4 +-
 .../Apparel%20Model%20Module/view.xml         |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../copy_colour_range_variation.xml           |   4 +-
 .../Apparel%20Model/development.xml           |   4 +-
 .../portal_types/Apparel%20Model/history.xml  |   4 +-
 .../Apparel%20Model/inventory_view.xml        |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 ...jump_to_related_apparel_transformation.xml |   4 +-
 .../portal_types/Apparel%20Model/metadata.xml |   4 +-
 .../Apparel%20Model/morphology_variation.xml  |   4 +-
 .../portal_types/Apparel%20Model/print.xml    |   4 +-
 .../Apparel%20Model/references.xml            |   4 +-
 .../portal_types/Apparel%20Model/view.xml     |   4 +-
 .../Apparel%20Model/view_price.xml            |   4 +-
 .../view_variated_reference_list.xml          |   4 +-
 .../Apparel%20Shape%20Module/csv_export.xml   |   4 +-
 .../Apparel%20Shape%20Module/csv_import.xml   |   4 +-
 .../Apparel%20Shape%20Module/list_ui.xml      |   4 +-
 .../Apparel%20Shape%20Module/print.xml        |   4 +-
 .../Apparel%20Shape%20Module/search.xml       |   4 +-
 .../Apparel%20Shape%20Module/sort_on.xml      |   4 +-
 .../Apparel%20Shape%20Module/view.xml         |   4 +-
 .../workflow_report.xml                       |   4 +-
 .../Apparel%20Shape/development.xml           |   4 +-
 .../portal_types/Apparel%20Shape/history.xml  |   4 +-
 .../jump_to_related_apparel_cloth.xml         |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 .../jump_to_related_apparel_shape.xml         |   4 +-
 .../portal_types/Apparel%20Shape/metadata.xml |   4 +-
 .../portal_types/Apparel%20Shape/print.xml    |   4 +-
 .../portal_types/Apparel%20Shape/view.xml     |   4 +-
 .../Apparel%20Size%20Module/csv_export.xml    |   4 +-
 .../Apparel%20Size%20Module/csv_import.xml    |   4 +-
 .../Apparel%20Size%20Module/list_ui.xml       |   4 +-
 .../Apparel%20Size%20Module/print.xml         |   4 +-
 .../Apparel%20Size%20Module/search.xml        |   4 +-
 .../Apparel%20Size%20Module/sort_on.xml       |   4 +-
 .../Apparel%20Size%20Module/view.xml          |   4 +-
 .../Apparel%20Size/customer_size.xml          |   4 +-
 .../portal_types/Apparel%20Size/history.xml   |   4 +-
 .../jump_to_related_apparel_model.xml         |   4 +-
 .../portal_types/Apparel%20Size/metadata.xml  |   4 +-
 .../portal_types/Apparel%20Size/print.xml     |   4 +-
 .../portal_types/Apparel%20Size/view.xml      |   4 +-
 .../download.xml                              |   4 +-
 .../Apparel%20Technical%20Drawing/history.xml |   4 +-
 .../image_view.xml                            |   4 +-
 .../metadata.xml                              |   4 +-
 .../Apparel%20Technical%20Drawing/view.xml    |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../view_quantity.xml                         |   4 +-
 .../csv_export.xml                            |   4 +-
 .../csv_import.xml                            |   4 +-
 .../list_ui.xml                               |   4 +-
 .../print.xml                                 |   4 +-
 .../search.xml                                |   4 +-
 .../sort_on.xml                               |   4 +-
 .../view.xml                                  |   4 +-
 .../complete_quantity_matrix.xml              |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../view_quantity.xml                         |   4 +-
 .../complete_quantity_matrix.xml              |   4 +-
 .../complete_variation_matrix.xml             |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../view_quantity.xml                         |   4 +-
 .../view_variation.xml                        |   4 +-
 .../expanded_view.xml                         |   4 +-
 .../Apparel%20Transformation/history.xml      |   4 +-
 ...jump_to_related_apparel_transformation.xml |   4 +-
 .../Apparel%20Transformation/metadata.xml     |   4 +-
 .../Apparel%20Transformation/print.xml        |   4 +-
 .../update_variation_list.xml                 |   4 +-
 .../Apparel%20Transformation/view.xml         |   4 +-
 ...view_transformation_assorted_component.xml |   4 +-
 .../view_transformation_component.xml         |   4 +-
 .../view_transformation_operation.xml         |   4 +-
 .../apparel_fabric_item_fast_input.xml        |   4 +-
 .../apparel_fabric_item_fast_input.xml        |   4 +-
 .../apparel_assortment_module.xml             |   8 -
 .../apparel_bath_module.xml                   |   6 -
 .../apparel_cloth_module.xml                  |   8 -
 .../apparel_colour_range_module.xml           |   8 -
 .../apparel_component_module.xml              |   8 -
 .../apparel_consumption_module.xml            |   8 -
 .../apparel_fabric_item_module.xml            |   8 -
 .../apparel_fabric_module.xml                 |   8 -
 .../apparel_measurement_module.xml            |   8 -
 .../apparel_model_module.xml                  |   8 -
 .../apparel_shape_module.xml                  |   8 -
 .../apparel_size_module.xml                   |   8 -
 .../apparel_transformation_module.xml         |   8 -
 ...arel%20Assortment%20Colour%20Variation.xml |   6 +
 .../Apparel%20Assortment%20Module.xml         |   6 +
 .../portal_types/Apparel%20Assortment.xml     |   6 +
 .../portal_types/Apparel%20Bath%20Module.xml  |   6 +
 .../portal_types/Apparel%20Bath.xml           |   6 +
 .../portal_types/Apparel%20Cloth%20Module.xml |   6 +
 .../portal_types/Apparel%20Cloth.xml          |   6 +
 .../Apparel%20Colour%20Range%20Module.xml     |   6 +
 .../Apparel%20Colour%20Range%20Variation.xml  |   6 +
 .../portal_types/Apparel%20Colour%20Range.xml |   6 +
 .../Apparel%20Component%20Module.xml          |   6 +
 .../Apparel%20Component%20Variation.xml       |   6 +
 .../portal_types/Apparel%20Component.xml      |   6 +
 .../Apparel%20Consumption%20Module.xml        |   6 +
 .../portal_types/Apparel%20Consumption.xml    |   6 +
 .../Apparel%20Fabric%20Colour%20Variation.xml |   6 +
 .../Apparel%20Fabric%20Item%20Module.xml      |   6 +
 .../portal_types/Apparel%20Fabric%20Item.xml  |   6 +
 .../Apparel%20Fabric%20Module.xml             |   6 +
 .../portal_types/Apparel%20Fabric.xml         |   6 +
 .../Apparel%20Measurement%20Module.xml        |   6 +
 .../portal_types/Apparel%20Measurement.xml    |   6 +
 .../Apparel%20Model%20Colour%20Variation.xml  |   6 +
 .../portal_types/Apparel%20Model%20Module.xml |   6 +
 ...parel%20Model%20Morphology%20Variation.xml |   6 +
 .../portal_types/Apparel%20Model.xml          |   6 +
 .../portal_types/Apparel%20Shape%20Module.xml |   6 +
 .../portal_types/Apparel%20Shape.xml          |   6 +
 .../portal_types/Apparel%20Size%20Module.xml  |   6 +
 .../portal_types/Apparel%20Size.xml           |   6 +
 .../Apparel%20Technical%20Drawing.xml         |   6 +
 ...20Transformation%20Assorted%20Resource.xml |   6 +
 .../Apparel%20Transformation%20Module.xml     |   6 +
 .../Apparel%20Transformation%20Operation.xml  |   6 +
 ...ransformation%20Transformed%20Resource.xml |   6 +
 .../portal_types/Apparel%20Transformation.xml |   6 +
 .../workflow_chain_type.xml                   | 146 ------------------
 bt5/erp5_apparel/bt/change_log                |   6 +
 bt5/erp5_apparel/bt/copyright_list            |   1 +
 bt5/erp5_apparel/bt/license                   |   1 +
 bt5/erp5_apparel/bt/maintainer_list           |   2 +
 .../bt/template_constraint_id_list            |   0
 .../bt/template_portal_type_roles_list        |   0
 .../template_portal_type_workflow_chain_list  |   0
 ...template_update_business_template_workflow |   1 +
 bt5/erp5_apparel/bt/template_update_tool      |   1 +
 306 files changed, 722 insertions(+), 742 deletions(-)
 delete mode 100644 bt5/erp5_apparel/PortalTypeTemplateItem/workflow_chain_type.xml
 create mode 100644 bt5/erp5_apparel/bt/maintainer_list
 create mode 100644 bt5/erp5_apparel/bt/template_constraint_id_list
 create mode 100644 bt5/erp5_apparel/bt/template_portal_type_roles_list
 create mode 100644 bt5/erp5_apparel/bt/template_portal_type_workflow_chain_list
 create mode 100644 bt5/erp5_apparel/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_apparel/bt/template_update_tool

diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/download.xml
index c730be268e..168f13aa0a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/image_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/image_view.xml
index cb00da64b7..a282181398 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/image_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/image_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/view.xml
index ded364f2ef..04e3727a33 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/view.xml
index 8d84d6d6d7..36137e9570 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view.xml
index 44f31cc4d7..26f071ec9a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view_related_apparel_transformation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view_related_apparel_transformation.xml
index 865e5c7a88..83dbcf532f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view_related_apparel_transformation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Assortment/view_related_apparel_transformation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/csv_export.xml
index 065f0520a5..9caba651c3 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/import_csv.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/import_csv.xml
index d3b662256e..5a8d8481df 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/import_csv.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/import_csv.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/list_ui.xml
index 2f284cd60d..3f6f17206e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/print.xml
index af7cb76a73..99a53add88 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/search.xml
index 4be9eb85c4..3c20464a75 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/sort_on.xml
index 86f46805c5..e844fa54d3 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/view.xml
index aea41f7cc8..357bb50676 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/history.xml
index 6d3ce567f3..b6c47d25b0 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/metadata.xml
index 089ff3d488..2aa4a6dcd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/print.xml
index af7cb76a73..99a53add88 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/view.xml
index 58d43ee943..77d82e1183 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Bath/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/view.xml
index a0f9003dbb..215437e7b3 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/apparel_measure.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/apparel_measure.xml
index c6b8eb6fc3..dc4aeed1b4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/apparel_measure.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/apparel_measure.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/development.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/development.xml
index 7f150a81af..5b5dc66b15 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/development.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/development.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/history.xml
index 2128082651..9d6a59576d 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model.xml
index 3a0fa0f687..76da888a09 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model_morphology_variation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model_morphology_variation.xml
index d2c65c7f6a..a11a023ac0 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model_morphology_variation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/jump_to_related_apparel_model_morphology_variation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/metadata.xml
index c65a63386c..0a41e665cb 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/print.xml
index 7bb2a2a63f..6ceeba4823 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/view.xml
index 5322c7654e..4ae829d3ae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Cloth/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/cvs_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/cvs_export.xml
index fd8c70a117..4c44aadf93 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/cvs_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/cvs_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/view.xml
index f2bd98f27d..1312e776db 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/history.xml
index 2618ce05bc..805b3b051f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/view.xml
index e5de78e257..89efd34f97 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/history.xml
index 2618ce05bc..805b3b051f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/jump_to_related_apparel_model.xml
index e1bed2b97f..18bf4110e6 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/view.xml
index ad949a95a6..54e7d41525 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Colour%20Range/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_import.xml
index 2fa3c7766a..053f01c787 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/view.xml
index 8522f98105..4c08a38b2e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/download.xml
index cbc120fdd3..d6c998d26e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/history_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/history_view.xml
index 04e5820d8c..5f68f2e3a9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/history_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/history_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/image_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/image_view.xml
index cb00da64b7..a282181398 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/image_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/image_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/view.xml
index da49416baa..ca736018c2 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/history.xml
index dafc5a3e36..01eb393a9e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/instruction_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/instruction_view.xml
index 433702d5c8..e459dc1399 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/instruction_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/instruction_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/metadata.xml
index 2ee5d0388b..28dee10aae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/price_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/price_view.xml
index f11579ddbd..30fd56bd4b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/price_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/price_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/print.xml
index cf33066016..7fe881ab9b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view.xml
index 2960262e6c..9954243b31 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_flow_capacity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_flow_capacity.xml
index e8bebbe15d..507cffcd52 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_flow_capacity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_flow_capacity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/view.xml
index b33341e297..63b50a7970 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print.xml
index 128303d6bd..4a53f8014a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print_matrix.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print_matrix.xml
index d36b450ce7..3eed70aad7 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print_matrix.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/print_matrix.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view.xml
index ffb001e65c..d91dee9dc3 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view_quantity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view_quantity.xml
index bb958b5502..0874360ab7 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view_quantity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Consumption/view_quantity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/download.xml
index cbc120fdd3..d6c998d26e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/image.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/image.xml
index c70f6b6795..b576c169f0 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/image.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/image.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/jump_to_related_apparel_colour_range_variation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/jump_to_related_apparel_colour_range_variation.xml
index 9b2ebae67b..c2e7cd926e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/jump_to_related_apparel_colour_range_variation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/jump_to_related_apparel_colour_range_variation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/view.xml
index b95abfcfbd..4c752c315f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/csv_export.xml
index 2bb104671a..ed2d1bfd0b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/import_csv.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/import_csv.xml
index ed1560229d..ca70313a7f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/import_csv.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/import_csv.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/list_ui.xml
index adefbf46ec..927b77360a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/view.xml
index d915d6e3b5..2e588785e6 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/history.xml
index 2618ce05bc..805b3b051f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/view.xml
index 74d416d5b7..e25bb8e44c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Item/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/csv_export.xml
index 2bb104671a..ed2d1bfd0b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/import_csv.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/import_csv.xml
index 768f6222c1..b5547d0537 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/import_csv.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/import_csv.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/list_ui.xml
index adefbf46ec..927b77360a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/view.xml
index 28d9b66ac7..8068f97ad6 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/history.xml
index b65d442ae4..675934be6f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml
index 60f8f6983b..5b35ffe7a8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/metadata.xml
index 7c4bbc83cb..5158e0899c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/print.xml
index 071c77ec45..5e7bc90e2c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view.xml
index 1e2daf9b03..506303ff2c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_composition.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_composition.xml
index 9004b6b468..f3ed5ffcb6 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_composition.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_composition.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_flow_capacity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_flow_capacity.xml
index 19698684cf..1613ea782f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_flow_capacity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_flow_capacity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_price.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_price.xml
index bb1715826b..b8770cf069 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_price.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/view_price.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/view.xml
index 0f0b25a00e..a944621f93 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/customer_measure.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/customer_measure.xml
index e3dbff8bec..80627204e1 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/customer_measure.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/customer_measure.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/download.xml
index d86932c743..444e25395e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/history.xml
index 2128082651..9d6a59576d 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/image.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/image.xml
index 1a140b2af7..0270aedc32 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/image.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/image.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
index 2050316242..3e41cee73c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_model.xml
index 3448a07f5b..8fafc6479d 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/metadata.xml
index c65a63386c..0a41e665cb 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/print.xml
index 7bb2a2a63f..6ceeba4823 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/view.xml
index c5abcc40da..258a1dbcb8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/download.xml
index c730be268e..168f13aa0a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/image_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/image_view.xml
index cb00da64b7..a282181398 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/image_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/image_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/view.xml
index ded364f2ef..04e3727a33 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/view.xml
index 006c01f377..e806f8953a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/history.xml
index 2618ce05bc..805b3b051f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/metadata.xml
index 75bb0c06aa..0105c089c8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/view.xml
index faddb4fe4a..940f13f716 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/copy_colour_range_variation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/copy_colour_range_variation.xml
index 97f6a7033a..44558a5f02 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/copy_colour_range_variation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/copy_colour_range_variation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml
index ea0a224ff6..c4e4146c42 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/history.xml
index 7de8f068e4..88214e1bd7 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/inventory_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/inventory_view.xml
index dd066ef086..316acf5cb1 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/inventory_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/inventory_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_model.xml
index 486c6792e5..9ca5dc594a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_transformation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_transformation.xml
index 94eca05231..fabbe92510 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_transformation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/jump_to_related_apparel_transformation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/metadata.xml
index 901853e02a..6c8c098a72 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/morphology_variation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/morphology_variation.xml
index 1fa3584052..8390b915b3 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/morphology_variation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/morphology_variation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/print.xml
index f4026fe517..24dafa5179 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/references.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/references.xml
index b0f039fa44..d79845ab88 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/references.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/references.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view.xml
index 4ca4e7bb72..f23bc67a65 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_price.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_price.xml
index 8f586f0b8d..b970eec7ce 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_price.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_price.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_variated_reference_list.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_variated_reference_list.xml
index 062f011594..c0b46b6f8c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_variated_reference_list.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_variated_reference_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/view.xml
index 188268778c..75911e614e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/workflow_report.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/workflow_report.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape%20Module/workflow_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/development.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/development.xml
index 459b872ebd..fc214cf668 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/development.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/development.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_cloth.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_cloth.xml
index ff5ecb4aff..3a0107465e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_cloth.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_cloth.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_model.xml
index b5e70ae99f..c7a92fb82c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_shape.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_shape.xml
index dca71bd2e6..701634541e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_shape.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/jump_to_related_apparel_shape.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/view.xml
index 8c34473a7e..fd2b289246 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Shape/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/view.xml
index 5d77ea63f4..8ae0cbc50e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/customer_size.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/customer_size.xml
index 05cfcd9ab0..0b987aefaf 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/customer_size.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/customer_size.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/jump_to_related_apparel_model.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/jump_to_related_apparel_model.xml
index 2711e823e6..c0d2e52f0a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/jump_to_related_apparel_model.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/jump_to_related_apparel_model.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/view.xml
index 762b649ddf..8d8f2596c9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Size/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/download.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/download.xml
index c730be268e..168f13aa0a 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/download.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/image_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/image_view.xml
index cb00da64b7..a282181398 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/image_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/image_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/view.xml
index e768797d8b..ad1e12fe53 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Technical%20Drawing/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view.xml
index e017ec336b..e100bc4975 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view_quantity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view_quantity.xml
index 99ab59f1fa..75f3834e85 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view_quantity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource/view_quantity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_export.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_export.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_import.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_import.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/list_ui.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/list_ui.xml
index f517059109..290ce9cbd4 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/list_ui.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/print.xml
index e7daf22090..08391c4184 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/search.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/search.xml
index 525d5747ed..858a40f690 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/search.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/sort_on.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/sort_on.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/view.xml
index cebd5f86d8..ca849f2739 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/complete_quantity_matrix.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/complete_quantity_matrix.xml
index 7c620adb00..18011124cd 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/complete_quantity_matrix.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/complete_quantity_matrix.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/history.xml
index cfc824f01c..c8ba1cc1c5 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/metadata.xml
index 8d1810743a..8921c12fae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/print.xml
index e88c85422a..c429be000e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view.xml
index 3ab4a99cab..e27a784bbf 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view_quantity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view_quantity.xml
index 13c27ac34d..b2a197ac7b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view_quantity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Operation/view_quantity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_quantity_matrix.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_quantity_matrix.xml
index b8291d9fb7..941d87795f 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_quantity_matrix.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_quantity_matrix.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_variation_matrix.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_variation_matrix.xml
index 9894949ec7..195ae8139d 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_variation_matrix.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/complete_variation_matrix.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/history.xml
index 2128082651..9d6a59576d 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/metadata.xml
index c65a63386c..0a41e665cb 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/print.xml
index 7bb2a2a63f..6ceeba4823 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view.xml
index 47a791d1a1..351403b4c1 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_quantity.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_quantity.xml
index 85b4226db1..ba5c3d85e0 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_quantity.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_quantity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_variation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_variation.xml
index 83a9524a1c..7e26384251 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_variation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource/view_variation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/expanded_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/expanded_view.xml
index a8c18d108b..96818325fb 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/expanded_view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/expanded_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/history.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/history.xml
index dafc5a3e36..01eb393a9e 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/history.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/jump_to_related_apparel_transformation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/jump_to_related_apparel_transformation.xml
index d949cd8b18..3d217db91b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/jump_to_related_apparel_transformation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/jump_to_related_apparel_transformation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/metadata.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/metadata.xml
index 2ee5d0388b..28dee10aae 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/metadata.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/print.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/print.xml
index cf33066016..7fe881ab9b 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/print.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/update_variation_list.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/update_variation_list.xml
index 0caf73f92f..97c5f182ea 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/update_variation_list.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/update_variation_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view.xml
index 1d4a092eb2..54da8353e9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_assorted_component.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_assorted_component.xml
index acb40e1327..fb64eb6fe9 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_assorted_component.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_assorted_component.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_component.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_component.xml
index 96eb132112..f16d5022cb 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_component.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_component.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_operation.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_operation.xml
index e55ad76251..a13f151c77 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_operation.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Transformation/view_transformation_operation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml
index b8f9708098..faedf06116 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml
index 7a3fa75b2b..caf7d2e786 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
index aee3382468..3b925bc6ed 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
index 45b54b0339..dc3e657cf4 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
@@ -400,9 +400,6 @@
   <permission>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
   </permission>
@@ -421,9 +418,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
   </permission>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
index aa1077ddc7..ff7828d348 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
index 99c6e00943..e8ebf573b5 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
index 46f5e47b3f..4ccdac02b7 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
index 4281fbe7ba..7590588728 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
index 1b203b5200..08a258c529 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
@@ -524,10 +524,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -551,10 +547,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
index 52e012e612..c369dc4a63 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
index 4239a2a4f0..c702ea99fb 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
index d5b8b2eb90..8f8275119c 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
index ae51eeb2c5..de5cda4ee8 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
index 38d4d95488..75984fe789 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
@@ -524,10 +524,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -551,10 +547,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
index 0116631c94..487d01ae04 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
@@ -546,10 +546,6 @@
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -573,10 +569,6 @@
   <permission>
    <name>Manage currencies</name>
   </permission>
-  <permission>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml
index 57e4b3be7f..d19b733a9b 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml
index 789ddfc707..8c8acd2a48 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml
index 293164f4a9..4cf1b0af07 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml
index 82322c28f8..6cf34dea8f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml
index 9d22d80a10..9c2609b5b0 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml
index ecbf97c255..899a29ad7a 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
index 077e0e40f8..f4640f46e7 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml
index ab5e44306c..fd9dba60e7 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml
index 238f03c6f4..6e4603eb8f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
index 448917a5f5..79383a3d74 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml
index 0333957e15..b8d01cbec1 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml
index ca5d104e16..369b7d6233 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml
index 196659f34a..ac507822b3 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml
index 0bdaf3a883..a827c32bb6 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml
index f198d11d5a..833190f3dc 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml
index 15d9234a82..776acbb189 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml
index 55c44d6db6..40993e6e52 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_action_list</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml
index 3a1c957e56..11a8220662 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml
index 03c894d8a6..b6900cda20 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml
index cccb17fd5f..2d54cfa699 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml
index 4ce5a26c9a..a82a02fbba 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml
index 960cdb86c3..f116bfe9d9 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml
index 8a7197b841..a413488393 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml
index 4755744dde..4cdb0e0708 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml
index d52b05595e..4dd9519724 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
index eb388cd1b6..9f750540fe 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml
index a603ce65e5..2dcdeb1cfe 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml
index 9823321b06..910dacaae3 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml
index aefbf6d425..e1048e52a6 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml
index 4754a8b714..1ca9a939ec 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml
index bcc1a060d0..0933e1e12e 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml
index 70e9c9b07b..4fc2770e58 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml
index f7c199a545..56b6a18e93 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml
index 9b08fcb190..ce58eab1c3 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml
index 9cd38f51d4..eabc2eb8ea 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml
index 6afe7c5337..46926e817d 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/workflow_chain_type.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/workflow_chain_type.xml
deleted file mode 100644
index 75b972d382..0000000000
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/workflow_chain_type.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<workflow_chain>
- <chain>
-  <type>Apparel Assortment</type>
-  <workflow>apparel_validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Assortment Colour Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Assortment Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Bath</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Bath Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Cloth</type>
-  <workflow>apparel_cloth_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Cloth Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Colour Range</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Colour Range Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Colour Range Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Component</type>
-  <workflow>apparel_validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Component Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Component Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Consumption</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Consumption Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Fabric</type>
-  <workflow>apparel_validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Fabric Colour Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Fabric Item</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Fabric Item Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Fabric Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Measurement</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Measurement Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Model</type>
-  <workflow>apparel_model_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Model Colour Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Model Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Model Morphology Variation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Shape</type>
-  <workflow>apparel_shape_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Shape Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Size</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Size Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Technical Drawing</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Transformation</type>
-  <workflow>apparel_validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Transformation Assorted Resource</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Transformation Module</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>Apparel Transformation Operation</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Apparel Transformation Transformed Resource</type>
-  <workflow>edit_workflow</workflow>
- </chain>
-</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/change_log b/bt5/erp5_apparel/bt/change_log
index 5075a378c3..fe2794d480 100644
--- a/bt5/erp5_apparel/bt/change_log
+++ b/bt5/erp5_apparel/bt/change_log
@@ -1,3 +1,9 @@
+2006-05-15 Romain
+* Update maintainers.
+
+2006-02-06 Kevin
+* Update copyright.
+
 2006-01-19 Kevin
 * Use Localizer instead of Translation Service in ApparelFabricItem_fastInput python script.
 
diff --git a/bt5/erp5_apparel/bt/copyright_list b/bt5/erp5_apparel/bt/copyright_list
index e69de29bb2..22de975f93 100644
--- a/bt5/erp5_apparel/bt/copyright_list
+++ b/bt5/erp5_apparel/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2001-2006 Nexedi SARL
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/license b/bt5/erp5_apparel/bt/license
index e69de29bb2..3a3e12bcad 100644
--- a/bt5/erp5_apparel/bt/license
+++ b/bt5/erp5_apparel/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/maintainer_list b/bt5/erp5_apparel/bt/maintainer_list
new file mode 100644
index 0000000000..d3e3ba8411
--- /dev/null
+++ b/bt5/erp5_apparel/bt/maintainer_list
@@ -0,0 +1,2 @@
+romain
+seb
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/template_constraint_id_list b/bt5/erp5_apparel/bt/template_constraint_id_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_apparel/bt/template_portal_type_roles_list b/bt5/erp5_apparel/bt/template_portal_type_roles_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_apparel/bt/template_portal_type_workflow_chain_list b/bt5/erp5_apparel/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_apparel/bt/template_update_business_template_workflow b/bt5/erp5_apparel/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_apparel/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/template_update_tool b/bt5/erp5_apparel/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_apparel/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
-- 
2.30.9