From 69531dd09afc9731de7e9935d3a9a64e4cde3e4a Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Wed, 15 Feb 2006 15:31:34 +0000
Subject: [PATCH] added jump actions to {sale|puchase}_{order|packing_list} to
 Peron portal type.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5706 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Container%20Cell/metadata.xml             |  4 +-
 .../portal_types/Container%20Cell/print.xml   |  4 +-
 .../portal_types/Container%20Cell/view.xml    |  4 +-
 .../Container%20Line/metadata.xml             |  4 +-
 .../portal_types/Container%20Line/print.xml   |  4 +-
 .../portal_types/Container%20Line/view.xml    |  4 +-
 .../Container%20Line/view_history.xml         |  4 +-
 .../Container%20Line/view_quantity.xml        |  4 +-
 .../portal_types/Container/history_view.xml   |  4 +-
 .../portal_types/Container/metadata.xml       |  4 +-
 .../portal_types/Container/print.xml          |  4 +-
 .../portal_types/Container/view.xml           |  4 +-
 .../Delivery%20Cell/history_view.xml          |  4 +-
 .../portal_types/Delivery%20Cell/metadata.xml |  4 +-
 .../portal_types/Delivery%20Cell/print.xml    |  4 +-
 .../portal_types/Delivery%20Cell/view.xml     |  4 +-
 .../portal_types/Delivery%20Rule/list.xml     |  4 +-
 .../portal_types/Delivery%20Rule/metadata.xml |  4 +-
 .../portal_types/Delivery%20Rule/print.xml    |  4 +-
 .../Delivery%20Rule/translate.xml             |  4 +-
 .../portal_types/Delivery%20Rule/view.xml     |  4 +-
 .../portal_types/Discount/history.xml         |  4 +-
 .../portal_types/Discount/metadata.xml        |  4 +-
 .../portal_types/Discount/print.xml           |  4 +-
 .../portal_types/Discount/view.xml            |  4 +-
 .../history.xml                               |  4 +-
 .../metadata.xml                              |  4 +-
 .../print.xml                                 |  4 +-
 .../quantity_view.xml                         |  4 +-
 .../Internal%20Packing%20List%20Line/view.xml |  4 +-
 .../view_price.xml                            |  4 +-
 .../print.xml                                 |  4 +-
 .../view.xml                                  |  4 +-
 .../Internal%20Packing%20List/history.xml     |  4 +-
 .../Internal%20Packing%20List/metadata.xml    |  4 +-
 .../Internal%20Packing%20List/print.xml       |  4 +-
 .../Internal%20Packing%20List/view.xml        |  4 +-
 .../Inventory%20Cell/history_view.xml         |  4 +-
 .../Inventory%20Cell/metadata.xml             |  4 +-
 .../portal_types/Inventory%20Cell/print.xml   |  4 +-
 .../portal_types/Inventory%20Cell/view.xml    |  4 +-
 .../portal_types/Inventory%20Line/history.xml |  4 +-
 .../Inventory%20Line/inventory_view.xml       |  4 +-
 .../Inventory%20Line/metadata.xml             |  4 +-
 .../Inventory%20Line/price_view.xml           |  4 +-
 .../portal_types/Inventory%20Line/print.xml   |  4 +-
 .../portal_types/Inventory%20Line/view.xml    |  4 +-
 .../Inventory%20Module/csv_export.xml         |  4 +-
 .../Inventory%20Module/csv_import.xml         |  4 +-
 .../Inventory%20Module/list_ui.xml            |  4 +-
 .../portal_types/Inventory%20Module/print.xml |  4 +-
 .../Inventory%20Module/search.xml             |  4 +-
 .../Inventory%20Module/sort_on.xml            |  4 +-
 .../portal_types/Inventory%20Module/view.xml  |  4 +-
 .../portal_types/Inventory/history.xml        |  4 +-
 .../portal_types/Inventory/metadata.xml       |  4 +-
 .../portal_types/Inventory/print.xml          |  4 +-
 .../portal_types/Inventory/view.xml           |  4 +-
 .../portal_types/Order%20Rule/list.xml        |  4 +-
 .../portal_types/Order%20Rule/metadata.xml    |  4 +-
 .../portal_types/Order%20Rule/print.xml       |  4 +-
 .../portal_types/Order%20Rule/translate.xml   |  4 +-
 .../portal_types/Order%20Rule/view.xml        |  4 +-
 .../Organisation/jump_to_purchase_order.xml   |  4 +-
 .../jump_to_purchase_packing_list.xml         |  4 +-
 .../Organisation/jump_to_sale_order.xml       |  4 +-
 .../jump_to_sale_packing_list.xml             |  4 +-
 .../Payment%20Condition/history.xml           |  4 +-
 .../Payment%20Condition/metadata.xml          |  4 +-
 .../Payment%20Condition/print.xml             |  4 +-
 .../Payment%20Condition/translate.xml         |  4 +-
 .../portal_types/Payment%20Condition/view.xml |  4 +-
 .../Person/jump_to_purchase_order.xml         | 93 +++++++++++++++++++
 .../Person/jump_to_purchase_packing_list.xml  | 93 +++++++++++++++++++
 .../Person/jump_to_sale_order.xml             | 93 +++++++++++++++++++
 .../Person/jump_to_sale_packing_list.xml      | 93 +++++++++++++++++++
 .../Purchase%20Order%20Line/history.xml       |  4 +-
 .../Purchase%20Order%20Line/metadata.xml      |  4 +-
 .../Purchase%20Order%20Line/price_view.xml    |  4 +-
 .../Purchase%20Order%20Line/print.xml         |  4 +-
 .../Purchase%20Order%20Line/quantity_view.xml |  4 +-
 .../Purchase%20Order%20Line/view.xml          |  4 +-
 .../Purchase%20Order%20Module/csv_export.xml  |  4 +-
 .../Purchase%20Order%20Module/csv_import.xml  |  4 +-
 .../Purchase%20Order%20Module/list_ui.xml     |  4 +-
 .../Purchase%20Order%20Module/print.xml       |  4 +-
 .../Purchase%20Order%20Module/search.xml      |  4 +-
 .../Purchase%20Order%20Module/sort_on.xml     |  4 +-
 .../Purchase%20Order%20Module/view.xml        |  4 +-
 .../workflow_report.xml                       |  4 +-
 .../apply_trade_condition.xml                 |  4 +-
 .../portal_types/Purchase%20Order/history.xml |  4 +-
 .../jump_to_related_purchase_packing_list.xml |  4 +-
 .../Purchase%20Order/metadata.xml             |  4 +-
 .../Purchase%20Order/payment_condition.xml    |  4 +-
 .../portal_types/Purchase%20Order/print.xml   |  4 +-
 .../Purchase%20Order/profile_view.xml         |  4 +-
 .../portal_types/Purchase%20Order/view.xml    |  4 +-
 .../Purchase%20Order/view_discount.xml        |  4 +-
 .../apparel_fabric_item_fast_input.xml        |  4 +-
 .../history_view.xml                          |  4 +-
 .../metadata.xml                              |  4 +-
 .../print.xml                                 |  4 +-
 .../Purchase%20Packing%20List%20Cell/view.xml |  4 +-
 .../apparel_fabric_item_fast_input.xml        |  4 +-
 .../history.xml                               |  4 +-
 .../metadata.xml                              |  4 +-
 .../print.xml                                 |  4 +-
 .../quantity_view.xml                         |  4 +-
 .../Purchase%20Packing%20List%20Line/view.xml |  4 +-
 .../view_price.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 +-
 .../workflow_report.xml                       |  4 +-
 .../Purchase%20Packing%20List/history.xml     |  4 +-
 .../jump_related_purchase_invoice.xml         |  4 +-
 .../Purchase%20Packing%20List/metadata.xml    |  4 +-
 .../Purchase%20Packing%20List/print.xml       |  4 +-
 .../Purchase%20Packing%20List/view.xml        |  4 +-
 .../Purchase%20Supply%20Module/csv_export.xml |  4 +-
 .../Purchase%20Supply%20Module/list_ui.xml    |  4 +-
 .../Purchase%20Supply%20Module/print.xml      |  4 +-
 .../Purchase%20Supply%20Module/sort_on.xml    |  4 +-
 .../Purchase%20Supply%20Module/view.xml       |  4 +-
 .../Purchase%20Supply/history.xml             |  4 +-
 .../Purchase%20Supply/metadata.xml            |  4 +-
 .../portal_types/Purchase%20Supply/print.xml  |  4 +-
 .../portal_types/Purchase%20Supply/view.xml   |  4 +-
 .../csv_import.xml                            |  4 +-
 .../cvs_export.xml                            |  4 +-
 .../list_ui.xml                               |  4 +-
 .../search.xml                                |  4 +-
 .../sort_on.xml                               |  4 +-
 .../view.xml                                  |  4 +-
 .../workflow_report.xml                       |  4 +-
 .../Purchase%20Trade%20Condition/metadata.xml |  4 +-
 .../Purchase%20Trade%20Condition/print.xml    |  4 +-
 .../Purchase%20Trade%20Condition/view.xml     |  4 +-
 .../view_discount.xml                         |  4 +-
 .../view_history.xml                          |  4 +-
 .../view_payment.xml                          |  4 +-
 .../view_profile.xml                          |  4 +-
 .../Sale%20Order%20Line/history.xml           |  4 +-
 .../Sale%20Order%20Line/metadata.xml          |  4 +-
 .../Sale%20Order%20Line/price_view.xml        |  4 +-
 .../Sale%20Order%20Line/print.xml             |  4 +-
 .../Sale%20Order%20Line/quantity_view.xml     |  4 +-
 .../portal_types/Sale%20Order%20Line/view.xml |  4 +-
 .../Sale%20Order%20Module/csv_export.xml      |  4 +-
 .../Sale%20Order%20Module/csv_import.xml      |  4 +-
 .../Sale%20Order%20Module/list_ui.xml         |  4 +-
 .../Sale%20Order%20Module/print.xml           |  4 +-
 .../Sale%20Order%20Module/search.xml          |  4 +-
 .../Sale%20Order%20Module/sort_on.xml         |  4 +-
 .../Sale%20Order%20Module/view.xml            |  4 +-
 .../Sale%20Order%20Module/workflow_report.xml |  4 +-
 .../Sale%20Order/apply_trade_condition.xml    |  4 +-
 .../portal_types/Sale%20Order/history.xml     |  4 +-
 .../jump_to_related_sale_packing_list.xml     |  4 +-
 .../portal_types/Sale%20Order/metadata.xml    |  4 +-
 .../Sale%20Order/payment_condition.xml        |  4 +-
 .../portal_types/Sale%20Order/print.xml       |  4 +-
 .../Sale%20Order/profile_view.xml             |  4 +-
 .../portal_types/Sale%20Order/view.xml        |  4 +-
 .../Sale%20Order/view_discount.xml            |  4 +-
 .../portal_types/Sale%20Order/view_stock.xml  |  4 +-
 .../history_view.xml                          |  4 +-
 .../Sale%20Packing%20List%20Cell/metadata.xml |  4 +-
 .../Sale%20Packing%20List%20Cell/print.xml    |  4 +-
 .../Sale%20Packing%20List%20Cell/view.xml     |  4 +-
 .../Sale%20Packing%20List%20Line/history.xml  |  4 +-
 .../Sale%20Packing%20List%20Line/metadata.xml |  4 +-
 .../price_view.xml                            |  4 +-
 .../Sale%20Packing%20List%20Line/print.xml    |  4 +-
 .../quantity_view.xml                         |  4 +-
 .../Sale%20Packing%20List%20Line/view.xml     |  4 +-
 .../csv_export.xml                            |  4 +-
 .../csv_import.xml                            |  4 +-
 .../list_ui.xml                               |  4 +-
 .../Sale%20Packing%20List%20Module/print.xml  |  4 +-
 .../Sale%20Packing%20List%20Module/search.xml |  4 +-
 .../sort_on.xml                               |  4 +-
 .../Sale%20Packing%20List%20Module/view.xml   |  4 +-
 .../workflow_report.xml                       |  4 +-
 .../choose_solve_actions.xml                  |  4 +-
 .../container_fast_input.xml                  |  4 +-
 .../Sale%20Packing%20List/history.xml         |  4 +-
 .../jump_related_sale_invoice.xml             |  4 +-
 .../Sale%20Packing%20List/metadata.xml        |  4 +-
 .../Sale%20Packing%20List/print.xml           |  4 +-
 .../Sale%20Packing%20List/view.xml            |  4 +-
 .../view_container_list.xml                   |  4 +-
 .../Sale%20Supply%20Module/csv_export.xml     |  4 +-
 .../Sale%20Supply%20Module/list_ui.xml        |  4 +-
 .../Sale%20Supply%20Module/print.xml          |  4 +-
 .../Sale%20Supply%20Module/sort_on.xml        |  4 +-
 .../Sale%20Supply%20Module/view.xml           |  4 +-
 .../portal_types/Sale%20Supply/history.xml    |  4 +-
 .../portal_types/Sale%20Supply/metadata.xml   |  4 +-
 .../portal_types/Sale%20Supply/print.xml      |  4 +-
 .../portal_types/Sale%20Supply/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 +-
 .../workflow_report.xml                       |  4 +-
 .../Sale%20Trade%20Condition/metadata.xml     |  4 +-
 .../Sale%20Trade%20Condition/print.xml        |  4 +-
 .../Sale%20Trade%20Condition/view.xml         |  4 +-
 .../view_discount.xml                         |  4 +-
 .../Sale%20Trade%20Condition/view_history.xml |  4 +-
 .../Sale%20Trade%20Condition/view_payment.xml |  4 +-
 .../Sale%20Trade%20Condition/view_profile.xml |  4 +-
 .../portal_types/Supply%20Cell/list.xml       |  4 +-
 .../portal_types/Supply%20Cell/metadata.xml   |  4 +-
 .../portal_types/Supply%20Cell/print.xml      |  4 +-
 .../portal_types/Supply%20Cell/translate.xml  |  4 +-
 .../portal_types/Supply%20Cell/view.xml       |  4 +-
 .../Supply%20Line/additional_price.xml        |  4 +-
 .../portal_types/Supply%20Line/base_price.xml |  4 +-
 .../Supply%20Line/discount_ratio.xml          |  4 +-
 .../exclusive_discount_ratio.xml              |  4 +-
 .../Supply%20Line/history_view.xml            |  4 +-
 .../Supply%20Line/metadata_view.xml           |  4 +-
 .../portal_types/Supply%20Line/print.xml      |  4 +-
 .../Supply%20Line/surcharge_ratio.xml         |  4 +-
 .../portal_types/Supply%20Line/view.xml       |  4 +-
 .../my_supply_line_price_currency.xml         |  2 +-
 .../Delivery_edit_UpdateSimulation.xml        |  2 -
 bt5/erp5_trade/bt/template_action_path_list   |  4 +
 238 files changed, 839 insertions(+), 465 deletions(-)
 create mode 100755 bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
 create mode 100755 bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
 create mode 100755 bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
 create mode 100755 bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml

diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/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_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml
index e880dd4da1..d20cdcbcef 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/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_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml
index 83afbb639c..d82b345eb8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/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_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml
index 8d1810743a..8921c12fae 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/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_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml
index e88c85422a..c429be000e 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/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_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
index 90d1a5cc72..339ae31d92 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/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_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml
index 06021a244f..223d9033b6 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_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_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
index 32b1b20de7..473d305198 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/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_trade/ActionTemplateItem/portal_types/Container/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml
index e0ceb79c23..6563eafed2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/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_trade/ActionTemplateItem/portal_types/Container/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/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_trade/ActionTemplateItem/portal_types/Container/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/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_trade/ActionTemplateItem/portal_types/Container/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
index 5d4505239d..82750b3fe7 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/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_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml
index e0ceb79c23..6563eafed2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/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_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/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_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/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_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
index 5bb8186734..dc1d4d38a8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/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_trade/ActionTemplateItem/portal_types/Delivery%20Rule/list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/list.xml
index a1b94da588..455e0aa862 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/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_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml
index 77c3a1074d..db70822926 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/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_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml
index 0f36220e9c..84644d264c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/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_trade/ActionTemplateItem/portal_types/Delivery%20Rule/translate.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/translate.xml
index b60374bfde..f0159088ca 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/translate.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/translate.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_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
index 99a185297c..1ac5fd73f0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/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_trade/ActionTemplateItem/portal_types/Discount/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml
index 2618ce05bc..805b3b051f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/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_trade/ActionTemplateItem/portal_types/Discount/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/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_trade/ActionTemplateItem/portal_types/Discount/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/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_trade/ActionTemplateItem/portal_types/Discount/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml
index 3a95989074..94febfd324 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/history.xml
index 2128082651..9d6a59576d 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/metadata.xml
index c65a63386c..0a41e665cb 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/print.xml
index 7bb2a2a63f..6ceeba4823 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml
index 7d19ea23ff..f42e96e471 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
index b926293f7c..a06efffbf0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml
index 021dcf254e..48196aa5e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/print.xml
index 741c97a043..75d89da833 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
index f118f6af83..6a3daaf3ff 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml
index 2618ce05bc..805b3b051f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
index b2238f7b2b..0987e0e019 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml
index e0ceb79c23..6563eafed2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/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_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/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_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/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_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
index 44fe886b60..63807b4ad4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
index 2128082651..9d6a59576d 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
index f2e47e27be..e33f26d6b9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
index c65a63386c..0a41e665cb 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
index d1757e0157..6489c0fc80 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
index 7bb2a2a63f..6ceeba4823 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
index bbd48df8f0..d70f12343e 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/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_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml
index f517059109..290ce9cbd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
index cdc50f0408..5704e587d9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%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_trade/ActionTemplateItem/portal_types/Inventory/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml
index 2618ce05bc..805b3b051f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/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_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/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_trade/ActionTemplateItem/portal_types/Inventory/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/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_trade/ActionTemplateItem/portal_types/Inventory/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
index 09ff55aa4a..7c26cf1f4c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/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_trade/ActionTemplateItem/portal_types/Order%20Rule/list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/list.xml
index a1b94da588..455e0aa862 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/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_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml
index 77c3a1074d..db70822926 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/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_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml
index 260711b750..3d4e17c8a6 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/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_trade/ActionTemplateItem/portal_types/Order%20Rule/translate.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/translate.xml
index b60374bfde..f0159088ca 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/translate.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/translate.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_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
index 99a185297c..1ac5fd73f0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/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_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
index 7b54c1884f..728244cbbd 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.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_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
index bacf7eea59..7ea02ecee1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_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_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
index 5b25368db6..22f5316349 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.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_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
index db1aeebf04..819b387654 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_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_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml
index cfc824f01c..c8ba1cc1c5 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/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_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml
index 8d1810743a..8921c12fae 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/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_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml
index 741c97a043..75d89da833 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/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_trade/ActionTemplateItem/portal_types/Payment%20Condition/translate.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/translate.xml
index 6f00b21084..95c371d4f6 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/translate.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/translate.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_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
index cc1740f48e..407af54dcc 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/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_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
new file mode 100755
index 0000000000..c7b9127509
--- /dev/null
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_purchase_order</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>18.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Purchase Order</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/purchase_order_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
new file mode 100755
index 0000000000..3d320bdaad
--- /dev/null
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_purchase_packing_list</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>19.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Purchase Packing List</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/purchase_packing_list_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
new file mode 100755
index 0000000000..c82ca25cfa
--- /dev/null
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_sale_order</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>21.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Sale Order</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/sale_order_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
new file mode 100755
index 0000000000..9755b1ae43
--- /dev/null
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_sale_packing_list</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>22.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Sale Packing List</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/sale_packing_list_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml
index c7ab962c98..e2856b9771 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml
index 512c2ef0f2..94e56f7335 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
index 10e08f89c7..8817a8df96 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml
index 75772c427b..1c37e22714 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
index 5ca5abcd1b..52790639d1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
index 2cde6c638a..9ab9f6df18 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/list_ui.xml
index f517059109..290ce9cbd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
index 9d7325200d..f4221924db 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%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_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
index 402b4f93c7..9277619864 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.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_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml
index dafc5a3e36..01eb393a9e 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/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_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml
index 976ea53447..fefcaaf135 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_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_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
index 2ee5d0388b..28dee10aae 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/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_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
index f1ead7f787..c512add6b2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.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_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml
index cf33066016..7fe881ab9b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/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_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
index a101e738f4..d3f093ac09 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_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_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
index 7d858fb85c..919bb3b437 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/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_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml
index 2e31e78b7b..e95469643b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml
index b8f9708098..faedf06116 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/apparel_fabric_item_fast_input.xml
+++ b/bt5/erp5_trade/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/history_view.xml
index 1f8cefb953..e3df751968 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/metadata.xml
index 089ff3d488..2aa4a6dcd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
index 812b8f896d..458f548c92 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml
index 7a3fa75b2b..caf7d2e786 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/apparel_fabric_item_fast_input.xml
+++ b/bt5/erp5_trade/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/history.xml
index c7ab962c98..e2856b9771 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/metadata.xml
index 512c2ef0f2..94e56f7335 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/print.xml
index 75772c427b..1c37e22714 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml
index 5ca5abcd1b..52790639d1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
index 9fb4771230..b300d734a8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml
index ad11584b9f..9ed527cbfb 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/list_ui.xml
index b75a2810f1..87f104e31f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
index 9d00d30467..a00aeb09cb 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml
index 6d3ce567f3..b6c47d25b0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml
index ad6ed0732c..69d419693a 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml
index 089ff3d488..2aa4a6dcd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
index 93f4bb2860..1d68f9d527 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/csv_export.xml
index 4b3ebc4f6b..00a535e66b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%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_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/list_ui.xml
index 2f284cd60d..3f6f17206e 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%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_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%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_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/sort_on.xml
index 86f46805c5..e844fa54d3 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%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_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml
index b0647911b3..7823040cea 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%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_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml
index 6d3ce567f3..b6c47d25b0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/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_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml
index 089ff3d488..2aa4a6dcd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/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_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/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_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml
index 1cd38ea3d0..ed93f85723 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/csv_import.xml
index 0e6ba971f8..12ce92fcb2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/cvs_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/cvs_export.xml
index b2e9c5d70a..b5eb7392e2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/cvs_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/list_ui.xml
index adefbf46ec..927b77360a 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/search.xml
index 5c6a87d2b2..cf7707e370 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
index fb54387924..f8af33e2d8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/workflow_report.xml
index 30028cfd7b..c00ec87a57 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml
index 2ee5d0388b..28dee10aae 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml
index cf33066016..7fe881ab9b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
index ad7c6c19c5..057c3654db 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.xml
index 2e31e78b7b..e95469643b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_history.xml
index d55e1ff09d..992d3706f0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
index f16e671072..6f80b9ed24 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.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_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
index 24d9291838..55033b5a05 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml
index c7ab962c98..e2856b9771 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml
index 512c2ef0f2..94e56f7335 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
index 10e08f89c7..8817a8df96 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml
index 75772c427b..1c37e22714 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
index 5ca5abcd1b..52790639d1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
index 2cde6c638a..9ab9f6df18 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/list_ui.xml
index f517059109..290ce9cbd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
index 40a10a03cb..9f89907993 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%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_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
index 75236c435e..768c9889e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.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_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml
index 7de8f068e4..88214e1bd7 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/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_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml
index c380787010..6db083644b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_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_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml
index 901853e02a..6c8c098a72 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/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_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
index 9c0368763d..83cd6b2891 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.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_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml
index f4026fe517..24dafa5179 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/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_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
index dd8320f065..71061c1241 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_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_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
index 455d59c14a..eac6186b41 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/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_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml
index 159cee083b..1d00d67933 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.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_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
index 8684f2e1d1..da92069df8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/history_view.xml
index e0ceb79c23..6563eafed2 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/metadata.xml
index 75bb0c06aa..0105c089c8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
index 5bb8186734..dc1d4d38a8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/history.xml
index c7ab962c98..e2856b9771 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/metadata.xml
index 512c2ef0f2..94e56f7335 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml
index 10e08f89c7..8817a8df96 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/print.xml
index 75772c427b..1c37e22714 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml
index 5ca5abcd1b..52790639d1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
index 9fb4771230..b300d734a8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_export.xml
index 88b3e2ef63..7b891294e9 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/list_ui.xml
index b75a2810f1..87f104e31f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
index bd106d391f..0d8dc4e4eb 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/choose_solve_actions.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/choose_solve_actions.xml
index 0c6c4b7527..4124c08872 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/choose_solve_actions.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/choose_solve_actions.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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml
index bfe402eeb4..20e8cb2b36 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml
index 78a1c04ac8..8a72e4e09d 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml
index 02c8454a9b..caffbd7c4a 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml
index 6e41be7e07..db21efb9f1 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml
index 32835eb363..49e1ade114 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
index d3b84e3454..9e178aaf7f 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/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_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml
index c12861cd6b..05dfaf2754 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_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_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/csv_export.xml
index 4b3ebc4f6b..00a535e66b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%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_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/list_ui.xml
index 2f284cd60d..3f6f17206e 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%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_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%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_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/sort_on.xml
index 86f46805c5..e844fa54d3 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%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_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml
index 3614fa83bd..1baaa98729 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%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_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml
index 6d3ce567f3..b6c47d25b0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/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_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml
index 089ff3d488..2aa4a6dcd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/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_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml
index af7cb76a73..99a53add88 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/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_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml
index d45be48198..a4ea24df46 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/csv_import.xml
index 8db7067bbb..4898e9946c 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/cvs_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/cvs_export.xml
index fd8c70a117..4c44aadf93 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/cvs_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/list_ui.xml
index f517059109..290ce9cbd4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/print.xml
index e7daf22090..08391c4184 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/search.xml
index 525d5747ed..858a40f690 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/sort_on.xml
index 4205dac02e..21ad81cae8 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
index b69d5277e1..acc6a9c84a 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/workflow_report.xml
index 02b4513ba1..4a2956528b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml
index 2ee5d0388b..28dee10aae 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml
index cf33066016..7fe881ab9b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
index 6c744d63dc..6e836e39ce 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.xml
index 2e31e78b7b..e95469643b 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_history.xml
index d55e1ff09d..992d3706f0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
index f16e671072..6f80b9ed24 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.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_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
index d5ff6bbf70..78a725f6f4 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.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_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml
index a1b94da588..455e0aa862 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/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_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml
index 77c3a1074d..db70822926 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/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_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml
index 6bfa5f5984..a5063a8132 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/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_trade/ActionTemplateItem/portal_types/Supply%20Cell/translate.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/translate.xml
index b60374bfde..f0159088ca 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/translate.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/translate.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_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml
index df0ef3012f..5d4bc4a84a 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/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_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml
index 79747cdd3f..8937cc2604 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_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_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml
index 0d13b89fd1..87343e6966 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_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_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml
index 88be014026..ec06a919f5 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.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_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.xml
index add904b762..5a849a279d 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.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_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml
index 435ab65406..5aad9ec2e3 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/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_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml
index 9e5b423ce2..1cba5d93e6 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_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_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml
index b1b40aea6a..4e376172bc 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/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_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml
index 56e336d61d..87a15043ef 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.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_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml
index 50f0066239..cb02540ae0 100755
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/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_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_supply_line_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_supply_line_price_currency.xml
index 9cfc939f2f..77ce24e76e 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_supply_line_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_supply_line_price_currency.xml
@@ -281,7 +281,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>here/CurrencyModule_getCurrencyItemList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
index f95c99db28..87f1ab98b3 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
@@ -68,8 +68,6 @@
                 <string>_delObject</string>
                 <string>plan</string>
                 <string>confirm</string>
-                <string>stop</string>
-                <string>deliver</string>
                 <string>start</string>
                 <string>setReady</string>
                 <string>order</string>
diff --git a/bt5/erp5_trade/bt/template_action_path_list b/bt5/erp5_trade/bt/template_action_path_list
index 26dddf36e8..aefb5220b2 100755
--- a/bt5/erp5_trade/bt/template_action_path_list
+++ b/bt5/erp5_trade/bt/template_action_path_list
@@ -70,6 +70,10 @@ Payment Condition | metadata
 Payment Condition | print
 Payment Condition | translate
 Payment Condition | view
+Person | jump_to_purchase_order
+Person | jump_to_purchase_packing_list
+Person | jump_to_sale_order
+Person | jump_to_sale_packing_list
 Purchase Order Line | history
 Purchase Order Line | metadata
 Purchase Order Line | price_view
-- 
2.30.9