From 86e2048de811c460c9a2ed0379d0a44422c40436 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Thu, 7 Jun 2007 07:14:08 +0000
Subject: [PATCH] - improved the inventory module: - display more columns in
 the listbox of the module - allow the delete action in draft state - add a
 constraint so that it is now forbidden to create two (or more) inventories
 for the same date, same resource, same variation, same node. - the xml format
 has changed partially

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14725 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Container%20Cell/metadata.xml             |   14 +-
 .../portal_types/Container%20Cell/print.xml   |   14 +-
 .../portal_types/Container%20Cell/view.xml    |   14 +-
 .../Container%20Line/metadata.xml             |   14 +-
 .../portal_types/Container%20Line/print.xml   |   14 +-
 .../portal_types/Container%20Line/view.xml    |   14 +-
 .../Container%20Line/view_history.xml         |   14 +-
 .../Container%20Line/view_quantity.xml        |   14 +-
 .../portal_types/Container/history_view.xml   |   14 +-
 .../portal_types/Container/metadata.xml       |   14 +-
 .../portal_types/Container/print.xml          |   14 +-
 .../portal_types/Container/view.xml           |   14 +-
 .../Delivery%20Cell/history_view.xml          |   14 +-
 .../portal_types/Delivery%20Cell/metadata.xml |   14 +-
 .../portal_types/Delivery%20Cell/print.xml    |   14 +-
 .../portal_types/Delivery%20Cell/view.xml     |   14 +-
 .../portal_types/Delivery%20Rule/history.xml  |   14 +-
 .../portal_types/Delivery%20Rule/metadata.xml |   14 +-
 .../portal_types/Delivery%20Rule/print.xml    |   14 +-
 .../portal_types/Delivery%20Rule/view.xml     |   14 +-
 .../portal_types/Discount/history.xml         |   14 +-
 .../portal_types/Discount/metadata.xml        |   14 +-
 .../portal_types/Discount/print.xml           |   14 +-
 .../portal_types/Discount/view.xml            |   14 +-
 .../history.xml                               |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../Internal%20Packing%20List%20Cell/view.xml |   14 +-
 .../history.xml                               |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../quantity_view.xml                         |   21 +-
 .../Internal%20Packing%20List%20Line/view.xml |   14 +-
 .../view_price.xml                            |   21 +-
 .../csv_export.xml                            |   14 +-
 .../csv_import.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../print.xml                                 |   14 +-
 .../search.xml                                |   14 +-
 .../sort_on.xml                               |   14 +-
 .../view.xml                                  |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../Internal%20Packing%20List/history.xml     |   14 +-
 .../Internal%20Packing%20List/metadata.xml    |   14 +-
 .../Internal%20Packing%20List/print.xml       |   14 +-
 .../Internal%20Packing%20List/view.xml        |   14 +-
 .../Inventory%20Cell/history_view.xml         |   14 +-
 .../Inventory%20Cell/metadata.xml             |   14 +-
 .../portal_types/Inventory%20Cell/print.xml   |   14 +-
 .../portal_types/Inventory%20Cell/view.xml    |   14 +-
 .../portal_types/Inventory%20Line/history.xml |   14 +-
 .../Inventory%20Line/inventory_view.xml       |   21 +-
 .../Inventory%20Line/metadata.xml             |   14 +-
 .../Inventory%20Line/price_view.xml           |   21 +-
 .../portal_types/Inventory%20Line/print.xml   |   14 +-
 .../portal_types/Inventory%20Line/view.xml    |   14 +-
 .../Inventory%20Module/csv_export.xml         |   14 +-
 .../Inventory%20Module/csv_import.xml         |   14 +-
 .../Inventory%20Module/list_ui.xml            |   14 +-
 .../portal_types/Inventory%20Module/print.xml |   14 +-
 .../Inventory%20Module/search.xml             |   14 +-
 .../Inventory%20Module/sort_on.xml            |   14 +-
 .../portal_types/Inventory%20Module/view.xml  |   14 +-
 .../portal_types/Inventory/history.xml        |   14 +-
 .../portal_types/Inventory/metadata.xml       |   14 +-
 .../portal_types/Inventory/print.xml          |   14 +-
 .../portal_types/Inventory/view.xml           |   14 +-
 .../portal_types/Order%20Rule/history.xml     |   14 +-
 .../portal_types/Order%20Rule/metadata.xml    |   14 +-
 .../portal_types/Order%20Rule/print.xml       |   14 +-
 .../portal_types/Order%20Rule/view.xml        |   14 +-
 .../Organisation/jump_to_purchase_order.xml   |   21 +-
 .../jump_to_purchase_packing_list.xml         |   21 +-
 .../Organisation/jump_to_sale_order.xml       |   21 +-
 .../jump_to_sale_packing_list.xml             |   21 +-
 .../Payment%20Condition/history.xml           |   14 +-
 .../Payment%20Condition/metadata.xml          |   14 +-
 .../Payment%20Condition/print.xml             |   14 +-
 .../portal_types/Payment%20Condition/view.xml |   14 +-
 .../Person/jump_to_purchase_order.xml         |   14 +-
 .../Person/jump_to_purchase_packing_list.xml  |   14 +-
 .../Person/jump_to_sale_order.xml             |   14 +-
 .../Person/jump_to_sale_packing_list.xml      |   14 +-
 .../Purchase%20Order%20Cell/history.xml       |   14 +-
 .../Purchase%20Order%20Cell/metadata.xml      |   14 +-
 .../Purchase%20Order%20Cell/print.xml         |   14 +-
 .../Purchase%20Order%20Cell/view.xml          |   14 +-
 .../Purchase%20Order%20Line/history.xml       |   14 +-
 .../Purchase%20Order%20Line/metadata.xml      |   14 +-
 .../Purchase%20Order%20Line/price_view.xml    |   21 +-
 .../Purchase%20Order%20Line/print.xml         |   14 +-
 .../Purchase%20Order%20Line/quantity_view.xml |   21 +-
 .../Purchase%20Order%20Line/view.xml          |   14 +-
 .../Purchase%20Order%20Module/csv_export.xml  |   14 +-
 .../Purchase%20Order%20Module/csv_import.xml  |   14 +-
 .../Purchase%20Order%20Module/list_ui.xml     |   14 +-
 .../Purchase%20Order%20Module/print.xml       |   14 +-
 .../Purchase%20Order%20Module/search.xml      |   14 +-
 .../Purchase%20Order%20Module/sort_on.xml     |   14 +-
 .../Purchase%20Order%20Module/view.xml        |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../apply_trade_condition.xml                 |   14 +-
 .../portal_types/Purchase%20Order/history.xml |   14 +-
 .../jump_to_related_purchase_packing_list.xml |   14 +-
 .../Purchase%20Order/metadata.xml             |   14 +-
 .../Purchase%20Order/payment_condition.xml    |   14 +-
 .../portal_types/Purchase%20Order/print.xml   |   14 +-
 .../Purchase%20Order/profile_view.xml         |   14 +-
 .../portal_types/Purchase%20Order/view.xml    |   14 +-
 .../Purchase%20Order/view_discount.xml        |   14 +-
 .../apparel_fabric_item_fast_input.xml        |   14 +-
 .../history_view.xml                          |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../Purchase%20Packing%20List%20Cell/view.xml |   14 +-
 .../apparel_fabric_item_fast_input.xml        |   14 +-
 .../history.xml                               |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../quantity_view.xml                         |   21 +-
 .../Purchase%20Packing%20List%20Line/view.xml |   14 +-
 .../view_price.xml                            |   21 +-
 .../csv_export.xml                            |   14 +-
 .../csv_import.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../print.xml                                 |   14 +-
 .../search.xml                                |   14 +-
 .../sort_on.xml                               |   14 +-
 .../view.xml                                  |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../choose_solve_actions.xml                  |   21 +-
 .../Purchase%20Packing%20List/history.xml     |   14 +-
 .../jump_related_purchase_invoice.xml         |   14 +-
 .../jump_related_purchase_order.xml           |   21 +-
 .../Purchase%20Packing%20List/metadata.xml    |   14 +-
 .../Purchase%20Packing%20List/print.xml       |   14 +-
 .../Purchase%20Packing%20List/view.xml        |   14 +-
 .../Purchase%20Supply%20Cell/history_view.xml |   14 +-
 .../Purchase%20Supply%20Cell/metadata.xml     |   14 +-
 .../Purchase%20Supply%20Cell/print.xml        |   14 +-
 .../Purchase%20Supply%20Cell/view.xml         |   14 +-
 .../additional_price.xml                      |   14 +-
 .../Purchase%20Supply%20Line/base_price.xml   |   14 +-
 .../discount_ratio.xml                        |   14 +-
 .../exclusive_discount_ratio.xml              |   14 +-
 .../Purchase%20Supply%20Line/history_view.xml |   14 +-
 .../metadata_view.xml                         |   14 +-
 .../non_discountable__additional_price.xml    |   14 +-
 .../Purchase%20Supply%20Line/print.xml        |   14 +-
 .../surcharge_ratio.xml                       |   14 +-
 .../variable_additional_price.xml             |   14 +-
 .../Purchase%20Supply%20Line/view.xml         |   14 +-
 .../Purchase%20Supply%20Module/csv_export.xml |   14 +-
 .../Purchase%20Supply%20Module/list_ui.xml    |   14 +-
 .../Purchase%20Supply%20Module/print.xml      |   14 +-
 .../Purchase%20Supply%20Module/search.xml     |   14 +-
 .../Purchase%20Supply%20Module/sort_on.xml    |   14 +-
 .../Purchase%20Supply%20Module/view.xml       |   14 +-
 .../Purchase%20Supply/history.xml             |   14 +-
 .../Purchase%20Supply/metadata.xml            |   14 +-
 .../portal_types/Purchase%20Supply/print.xml  |   14 +-
 .../portal_types/Purchase%20Supply/view.xml   |   14 +-
 .../csv_import.xml                            |   14 +-
 .../cvs_export.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../search.xml                                |   14 +-
 .../sort_on.xml                               |   14 +-
 .../view.xml                                  |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../Purchase%20Trade%20Condition/metadata.xml |   14 +-
 .../Purchase%20Trade%20Condition/print.xml    |   14 +-
 .../Purchase%20Trade%20Condition/view.xml     |   14 +-
 .../view_discount.xml                         |   14 +-
 .../view_history.xml                          |   14 +-
 .../view_payment.xml                          |   14 +-
 .../view_profile.xml                          |   14 +-
 .../history_view.xml                          |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../view.xml                                  |   14 +-
 .../history.xml                               |   14 +-
 .../metadata.xml                              |   14 +-
 .../price_view.xml                            |   21 +-
 .../print.xml                                 |   14 +-
 .../quantity_view.xml                         |   21 +-
 .../view.xml                                  |   14 +-
 .../csv_export.xml                            |   14 +-
 .../csv_import.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../print.xml                                 |   14 +-
 .../search.xml                                |   14 +-
 .../sort_on.xml                               |   14 +-
 .../view.xml                                  |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../choose_solve_actions.xml                  |   14 +-
 .../history.xml                               |   14 +-
 .../jump_related_sale_invoice.xml             |   14 +-
 .../metadata.xml                              |   14 +-
 .../print.xml                                 |   14 +-
 .../Returned%20Sale%20Packing%20List/view.xml |   14 +-
 .../Sale%20Order%20Cell/history.xml           |   14 +-
 .../Sale%20Order%20Cell/metadata.xml          |   14 +-
 .../Sale%20Order%20Cell/print.xml             |   14 +-
 .../portal_types/Sale%20Order%20Cell/view.xml |   14 +-
 .../Sale%20Order%20Line/history.xml           |   14 +-
 .../Sale%20Order%20Line/metadata.xml          |   14 +-
 .../Sale%20Order%20Line/price_view.xml        |   21 +-
 .../Sale%20Order%20Line/print.xml             |   14 +-
 .../Sale%20Order%20Line/quantity_view.xml     |   21 +-
 .../portal_types/Sale%20Order%20Line/view.xml |   14 +-
 .../Sale%20Order%20Module/csv_export.xml      |   14 +-
 .../Sale%20Order%20Module/csv_import.xml      |   14 +-
 .../Sale%20Order%20Module/list_ui.xml         |   14 +-
 .../Sale%20Order%20Module/print.xml           |   14 +-
 .../Sale%20Order%20Module/search.xml          |   14 +-
 .../Sale%20Order%20Module/sort_on.xml         |   14 +-
 .../Sale%20Order%20Module/view.xml            |   14 +-
 .../Sale%20Order%20Module/workflow_report.xml |   14 +-
 .../Sale%20Order/apply_trade_condition.xml    |   14 +-
 .../portal_types/Sale%20Order/history.xml     |   14 +-
 .../jump_to_related_sale_packing_list.xml     |   14 +-
 .../portal_types/Sale%20Order/metadata.xml    |   14 +-
 .../Sale%20Order/payment_condition.xml        |   14 +-
 .../portal_types/Sale%20Order/print.xml       |   14 +-
 .../Sale%20Order/profile_view.xml             |   14 +-
 .../portal_types/Sale%20Order/view.xml        |   14 +-
 .../Sale%20Order/view_discount.xml            |   14 +-
 .../portal_types/Sale%20Order/view_stock.xml  |   14 +-
 .../history_view.xml                          |   14 +-
 .../Sale%20Packing%20List%20Cell/metadata.xml |   14 +-
 .../Sale%20Packing%20List%20Cell/print.xml    |   14 +-
 .../Sale%20Packing%20List%20Cell/view.xml     |   14 +-
 .../Sale%20Packing%20List%20Line/history.xml  |   14 +-
 .../Sale%20Packing%20List%20Line/metadata.xml |   14 +-
 .../price_view.xml                            |   21 +-
 .../Sale%20Packing%20List%20Line/print.xml    |   14 +-
 .../quantity_view.xml                         |   21 +-
 .../Sale%20Packing%20List%20Line/view.xml     |   14 +-
 .../csv_export.xml                            |   14 +-
 .../csv_import.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../Sale%20Packing%20List%20Module/print.xml  |   14 +-
 .../Sale%20Packing%20List%20Module/search.xml |   14 +-
 .../sort_on.xml                               |   14 +-
 .../Sale%20Packing%20List%20Module/view.xml   |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../choose_solve_actions.xml                  |   21 +-
 .../container_fast_input.xml                  |   14 +-
 .../Sale%20Packing%20List/history.xml         |   14 +-
 .../jump_related_sale_invoice.xml             |   14 +-
 .../Sale%20Packing%20List/metadata.xml        |   14 +-
 .../Sale%20Packing%20List/print.xml           |   14 +-
 .../Sale%20Packing%20List/view.xml            |   14 +-
 .../view_container_list.xml                   |   14 +-
 .../Sale%20Supply%20Cell/history_view.xml     |   14 +-
 .../Sale%20Supply%20Cell/metadata.xml         |   14 +-
 .../Sale%20Supply%20Cell/print.xml            |   14 +-
 .../Sale%20Supply%20Cell/view.xml             |   14 +-
 .../Sale%20Supply%20Line/additional_price.xml |   14 +-
 .../Sale%20Supply%20Line/base_price.xml       |   14 +-
 .../Sale%20Supply%20Line/discount_ratio.xml   |   14 +-
 .../exclusive_discount_ratio.xml              |   14 +-
 .../Sale%20Supply%20Line/history_view.xml     |   14 +-
 .../Sale%20Supply%20Line/metadata_view.xml    |   14 +-
 .../non_discountable__additional_price.xml    |   14 +-
 .../Sale%20Supply%20Line/print.xml            |   14 +-
 .../Sale%20Supply%20Line/surcharge_ratio.xml  |   14 +-
 .../variable_additional_price.xml             |   14 +-
 .../Sale%20Supply%20Line/view.xml             |   14 +-
 .../Sale%20Supply%20Module/csv_export.xml     |   14 +-
 .../Sale%20Supply%20Module/list_ui.xml        |   14 +-
 .../Sale%20Supply%20Module/print.xml          |   14 +-
 .../Sale%20Supply%20Module/search.xml         |   14 +-
 .../Sale%20Supply%20Module/sort_on.xml        |   14 +-
 .../Sale%20Supply%20Module/view.xml           |   14 +-
 .../portal_types/Sale%20Supply/history.xml    |   14 +-
 .../portal_types/Sale%20Supply/metadata.xml   |   14 +-
 .../portal_types/Sale%20Supply/print.xml      |   14 +-
 .../portal_types/Sale%20Supply/view.xml       |   14 +-
 .../csv_import.xml                            |   14 +-
 .../cvs_export.xml                            |   14 +-
 .../list_ui.xml                               |   14 +-
 .../print.xml                                 |   14 +-
 .../search.xml                                |   14 +-
 .../sort_on.xml                               |   14 +-
 .../view.xml                                  |   14 +-
 .../workflow_report.xml                       |   14 +-
 .../Sale%20Trade%20Condition/metadata.xml     |   14 +-
 .../Sale%20Trade%20Condition/print.xml        |   14 +-
 .../Sale%20Trade%20Condition/view.xml         |   14 +-
 .../view_discount.xml                         |   14 +-
 .../Sale%20Trade%20Condition/view_history.xml |   14 +-
 .../Sale%20Trade%20Condition/view_payment.xml |   14 +-
 .../Sale%20Trade%20Condition/view_profile.xml |   14 +-
 .../portal_types/Supply%20Cell/list.xml       |   14 +-
 .../portal_types/Supply%20Cell/metadata.xml   |   14 +-
 .../portal_types/Supply%20Cell/print.xml      |   14 +-
 .../portal_types/Supply%20Cell/view.xml       |   14 +-
 .../Supply%20Line/additional_price.xml        |   14 +-
 .../portal_types/Supply%20Line/base_price.xml |   14 +-
 .../Supply%20Line/discount_ratio.xml          |   14 +-
 .../exclusive_discount_ratio.xml              |   14 +-
 .../Supply%20Line/history_view.xml            |   14 +-
 .../Supply%20Line/metadata_view.xml           |   14 +-
 .../non_discountable__additional_price.xml    |   14 +-
 .../portal_types/Supply%20Line/print.xml      |   14 +-
 .../Supply%20Line/surcharge_ratio.xml         |   14 +-
 .../variable_additional_price.xml             |   14 +-
 .../portal_types/Supply%20Line/view.xml       |   14 +-
 .../portal_categories/delivery_mode.xml       |   31 +-
 .../portal_categories/discount_type.xml       |  155 +-
 .../portal_categories/incoterm.xml            |   31 +-
 .../portal_categories/payment_mode.xml        |   31 +-
 .../portal_categories/segmentation.xml        |   31 +-
 .../portal_categories/trade_date.xml          |   31 +-
 .../DuplicateInventory.py                     |  122 ++
 .../internal_packing_list_module.xml          |   92 +-
 .../ModuleTemplateItem/inventory_module.xml   |   92 +-
 .../purchase_order_module.xml                 |   98 +-
 .../purchase_packing_list_module.xml          |   98 +-
 .../purchase_supply_module.xml                |   85 +-
 .../purchase_trade_condition_module.xml       |   98 +-
 .../returned_sale_packing_list_module.xml     |   95 +-
 .../ModuleTemplateItem/sale_order_module.xml  |  107 +-
 .../sale_packing_list_module.xml              |  107 +-
 .../ModuleTemplateItem/sale_supply_module.xml |   95 +-
 .../sale_trade_condition_module.xml           |  107 +-
 .../portal_categories/order/supply.xml        |    7 +-
 .../portal_categories/resource/packing.xml    |    7 +-
 .../portal_categories/trade_date/invoice.xml  |    7 +-
 .../portal_categories/trade_date/order.xml    |    7 +-
 .../trade_date/packing%20list.xml             |    7 +-
 .../purchase_packing_list_builder.xml         |    7 +-
 .../sale_packing_list_builder.xml             |    7 +-
 .../portal_rules/default_delivery_rule.xml    |   31 +-
 .../default_category_tester.xml               |    7 +-
 .../default_property_tester.xml               |    7 +-
 .../default_quantity_tester.xml               |    7 +-
 .../portal_rules/default_order_rule.xml       |   31 +-
 .../default_category_tester.xml               |    7 +-
 .../default_property_tester.xml               |    7 +-
 .../default_quantity_tester.xml               |    7 +-
 .../property_sheet_list.xml                   |    3 +
 .../portal_types/Container%20Cell.xml         |    7 +-
 .../portal_types/Container%20Line.xml         |    7 +-
 .../portal_types/Container.xml                |    7 +-
 .../portal_types/Delivery%20Cell.xml          |    7 +-
 .../portal_types/Delivery%20Rule.xml          |    7 +-
 .../portal_types/Discount.xml                 |    7 +-
 .../Internal%20Packing%20List%20Cell.xml      |    7 +-
 .../Internal%20Packing%20List%20Line.xml      |    7 +-
 .../Internal%20Packing%20List%20Module.xml    |    7 +-
 .../Internal%20Packing%20List.xml             |    7 +-
 .../portal_types/Inventory%20Cell.xml         |    7 +-
 .../portal_types/Inventory%20Line.xml         |    7 +-
 .../portal_types/Inventory%20Module.xml       |    7 +-
 .../portal_types/Inventory.xml                |   11 +-
 .../portal_types/Order%20Rule.xml             |    7 +-
 .../portal_types/Payment%20Condition.xml      |    7 +-
 .../portal_types/Purchase%20Order%20Cell.xml  |    7 +-
 .../portal_types/Purchase%20Order%20Line.xml  |    7 +-
 .../Purchase%20Order%20Module.xml             |    7 +-
 .../portal_types/Purchase%20Order.xml         |    7 +-
 .../Purchase%20Packing%20List%20Cell.xml      |    7 +-
 .../Purchase%20Packing%20List%20Line.xml      |    7 +-
 .../Purchase%20Packing%20List%20Module.xml    |    7 +-
 .../Purchase%20Packing%20List.xml             |    7 +-
 .../portal_types/Purchase%20Supply%20Cell.xml |    7 +-
 .../portal_types/Purchase%20Supply%20Line.xml |    7 +-
 .../Purchase%20Supply%20Module.xml            |    7 +-
 .../portal_types/Purchase%20Supply.xml        |    7 +-
 .../Purchase%20Trade%20Condition%20Module.xml |    7 +-
 .../Purchase%20Trade%20Condition.xml          |    7 +-
 ...eturned%20Sale%20Packing%20List%20Cell.xml |    7 +-
 ...eturned%20Sale%20Packing%20List%20Line.xml |    7 +-
 ...urned%20Sale%20Packing%20List%20Module.xml |    7 +-
 .../Returned%20Sale%20Packing%20List.xml      |    7 +-
 .../portal_types/Sale%20Order%20Cell.xml      |    7 +-
 .../portal_types/Sale%20Order%20Line.xml      |    7 +-
 .../portal_types/Sale%20Order%20Module.xml    |    7 +-
 .../portal_types/Sale%20Order.xml             |    7 +-
 .../Sale%20Packing%20List%20Cell.xml          |    7 +-
 .../Sale%20Packing%20List%20Line.xml          |    7 +-
 .../Sale%20Packing%20List%20Module.xml        |    7 +-
 .../portal_types/Sale%20Packing%20List.xml    |    7 +-
 .../portal_types/Sale%20Supply%20Cell.xml     |    7 +-
 .../portal_types/Sale%20Supply%20Line.xml     |    7 +-
 .../portal_types/Sale%20Supply%20Module.xml   |    7 +-
 .../portal_types/Sale%20Supply.xml            |    7 +-
 .../Sale%20Trade%20Condition%20Module.xml     |    7 +-
 .../portal_types/Sale%20Trade%20Condition.xml |    7 +-
 .../portal_types/Supply%20Cell.xml            |    7 +-
 .../portal_types/Supply%20Line.xml            |    7 +-
 .../portal_skins/erp5_trade.xml               |    7 +-
 .../BaseTradePurchase_FieldLibrary.xml        |    7 +-
 .../immobilisation_state.xml                  |    7 +-
 .../my_activity.xml                           |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../my_comment.xml                            |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_description.xml                        |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_decision_title.xml         |    7 +-
 .../my_destination_payment_title.xml          |    7 +-
 .../my_destination_reference.xml              |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_effective_date.xml                     |    7 +-
 .../my_errand_ratio.xml                       |    7 +-
 .../my_expiration_date.xml                    |    7 +-
 .../my_group.xml                              |    7 +-
 .../my_incoterm.xml                           |    7 +-
 .../my_order.xml                              |    7 +-
 .../my_origin.xml                             |    7 +-
 .../my_price.xml                              |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_quantity.xml                           |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_received_date.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_segmentation.xml                       |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 ..._source_decision_destination_reference.xml |    7 +-
 .../my_source_decision_title.xml              |    7 +-
 .../my_source_payment_title.xml               |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../my_start_date.xml                         |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 .../my_start_date_range_min.xml               |    7 +-
 .../my_stop_date.xml                          |    7 +-
 .../my_title.xml                              |    7 +-
 .../simulation_state.xml                      |    7 +-
 .../total_price.xml                           |    7 +-
 .../erp5_trade/BaseTradeSale_FieldLibrary.xml |    7 +-
 .../immobilisation_state.xml                  |    7 +-
 .../my_activity.xml                           |    7 +-
 .../my_aggregate_title_list.xml               |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../BaseTradeSale_FieldLibrary/my_comment.xml |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_description.xml                        |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_decision_title.xml         |    7 +-
 .../my_destination_payment_title.xml          |    7 +-
 .../my_destination_reference.xml              |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_effective_date.xml                     |    7 +-
 .../my_errand_ratio.xml                       |    7 +-
 .../my_expiration_date.xml                    |    7 +-
 .../BaseTradeSale_FieldLibrary/my_group.xml   |    7 +-
 .../my_incoterm.xml                           |    7 +-
 .../BaseTradeSale_FieldLibrary/my_order.xml   |    7 +-
 .../BaseTradeSale_FieldLibrary/my_origin.xml  |    7 +-
 .../BaseTradeSale_FieldLibrary/my_price.xml   |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_quantity.xml                           |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_received_date.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_segmentation.xml                       |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 ..._source_decision_destination_reference.xml |    7 +-
 .../my_source_decision_title.xml              |    7 +-
 .../my_source_payment_title.xml               |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../my_start_date.xml                         |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 .../my_start_date_range_min.xml               |    7 +-
 .../my_stop_date.xml                          |    7 +-
 .../BaseTradeSale_FieldLibrary/my_title.xml   |    7 +-
 .../simulation_state.xml                      |    7 +-
 .../total_price.xml                           |    7 +-
 .../erp5_trade/ContainerLine_asCellRange.xml  |    7 +-
 .../erp5_trade/ContainerLine_view.xml         |    7 +-
 .../erp5_trade/ContainerLine_viewQuantity.xml |    7 +-
 .../erp5_trade/ContainerLine_zGetTotal.xml    |   13 +-
 .../erp5_trade/Container_view.xml             |    7 +-
 .../erp5_trade/Container_zGetTotal.xml        |   13 +-
 ...verBuilder_selectConfirmedDeliveryList.xml |    7 +-
 .../erp5_trade/DeliveryCell_asPredicate.xml   |    7 +-
 .../erp5_trade/DeliveryCell_view.xml          |    7 +-
 .../my_aggregate_title_list.xml               |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../DeliveryCell_view/my_description.xml      |    7 +-
 .../erp5_trade/DeliveryCell_view/my_price.xml |    7 +-
 .../DeliveryCell_view/my_quantity.xml         |    7 +-
 .../DeliveryCell_view/my_quantity_unit.xml    |    7 +-
 .../DeliveryCell_view/my_resource_title.xml   |    7 +-
 .../erp5_trade/DeliveryCell_view/my_title.xml |    7 +-
 .../my_variation_category_list.xml            |    7 +-
 .../erp5_trade/DeliveryLine_asCellRange.xml   |    7 +-
 ...veryLine_hashVariationCategoryItemList.xml |    7 +-
 .../erp5_trade/DeliveryLine_view.xml          |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../DeliveryLine_view/my_description.xml      |    7 +-
 .../erp5_trade/DeliveryLine_view/my_price.xml |    7 +-
 .../DeliveryLine_view/my_quantity.xml         |    7 +-
 .../DeliveryLine_view/my_quantity_unit.xml    |    7 +-
 .../DeliveryLine_view/my_resource_title.xml   |    7 +-
 .../DeliveryLine_view/my_start_date.xml       |    7 +-
 .../DeliveryLine_view/my_stop_date.xml        |    7 +-
 .../erp5_trade/DeliveryLine_view/my_title.xml |    7 +-
 .../my_variation_category_list.xml            |    7 +-
 .../DeliveryLine_view/total_price.xml         |    7 +-
 .../DeliveryLine_view/total_quantity.xml      |    7 +-
 .../DeliveryLine_viewIndustrialPhase.xml      |    7 +-
 .../erp5_trade/DeliveryLine_viewPrice.xml     |    7 +-
 .../erp5_trade/DeliveryLine_viewQuantity.xml  |    7 +-
 .../DeliveryLine_zGetRelatedQuantity.xml      |   13 +-
 .../erp5_trade/DeliveryLine_zGetTotal.xml     |   13 +-
 .../erp5_trade/Delivery_confirm.xml           |    7 +-
 .../Delivery_getDivergenceMessageList.xml     |    7 +-
 .../erp5_trade/Delivery_mergeDeliveryList.xml |    7 +-
 .../Delivery_setCausalityFromSimulation.xml   |    7 +-
 .../erp5_trade/Delivery_viewDivergence.xml    |    7 +-
 .../Delivery_viewDivergence/listbox.xml       |    7 +-
 .../erp5_trade/Delivery_viewInventory.xml     |    7 +-
 .../Delivery_viewMergedDeliveryList.xml       |    7 +-
 .../listbox.xml                               |    7 +-
 .../erp5_trade/Delivery_zGetTotal.xml         |   13 +-
 .../portal_skins/erp5_trade/Discount_view.xml |    7 +-
 ...ListModule_viewInternalPackingListList.xml |    7 +-
 .../erp5_trade/InternalPackingList_view.xml   |    7 +-
 .../immobilisation_state.xml                  |    7 +-
 .../InternalPackingList_view/listbox.xml      |    7 +-
 .../my_description.xml                        |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../my_start_date.xml                         |    7 +-
 .../InternalPackingList_view/my_stop_date.xml |    7 +-
 .../InternalPackingList_view/my_title.xml     |    7 +-
 .../simulation_state.xml                      |    7 +-
 .../InternalPackingList_view/total_price.xml  |    7 +-
 .../erp5_trade/InventoryCell_view.xml         |    7 +-
 .../my_aggregate_title_list.xml               |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../InventoryCell_view/my_description.xml     |    7 +-
 .../InventoryCell_view/my_inventory.xml       |    7 +-
 .../InventoryCell_view/my_price.xml           |    7 +-
 .../InventoryCell_view/my_quantity_unit.xml   |    7 +-
 .../InventoryCell_view/my_resource_title.xml  |    7 +-
 .../InventoryCell_view/my_title.xml           |    7 +-
 .../my_variation_category_list.xml            |    7 +-
 .../erp5_trade/InventoryLine_asCellRange.xml  |    7 +-
 .../erp5_trade/InventoryLine_view.xml         |    7 +-
 .../my_aggregate_title_list.xml               |    7 +-
 .../my_amortisation_method.xml                |   13 +-
 .../InventoryLine_view/my_description.xml     |    7 +-
 .../InventoryLine_view/my_inventory.xml       |    7 +-
 .../InventoryLine_view/my_price.xml           |    7 +-
 .../InventoryLine_view/my_quantity_unit.xml   |    7 +-
 .../InventoryLine_view/my_resource_title.xml  |    7 +-
 .../InventoryLine_view/my_title.xml           |    7 +-
 .../my_variation_category_list.xml            |    7 +-
 .../InventoryLine_viewInventory.xml           |    7 +-
 .../erp5_trade/InventoryLine_viewPrice.xml    |    7 +-
 .../erp5_trade/InventoryLine_zGetTotal.xml    |   13 +-
 .../InventoryModule_viewInventoryList.xml     |    7 +-
 .../listbox.xml                               |   34 +-
 .../erp5_trade/Inventory_view.xml             |    7 +-
 .../Inventory_view/immobilisation_state.xml   |   13 +-
 .../erp5_trade/Inventory_view/listbox.xml     |   30 +-
 .../Inventory_view/my_description.xml         |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../Inventory_view/my_destination_title.xml   |   11 +-
 .../Inventory_view/my_start_date.xml          |    7 +-
 .../erp5_trade/Inventory_view/my_title.xml    |    7 +-
 .../Inventory_view/simulation_state.xml       |   13 +-
 .../erp5_trade/Movement_getPackedQuantity.xml |    7 +-
 .../Movement_zGetPackedQuantity.xml           |   13 +-
 .../erp5_trade/OrderLine_asCellRange.xml      |    7 +-
 .../OrderLine_zGetRelatedQuantity.xml         |   13 +-
 .../erp5_trade/Order_zSelectMovement.xml      |   13 +-
 .../PackingListContent_updateAfterEdit.xml    |    7 +-
 .../erp5_trade/PackingListLine_view.xml       |    7 +-
 .../my_amortisation_method.xml                |    7 +-
 .../PackingListLine_view/my_description.xml   |    7 +-
 .../PackingListLine_view/my_price.xml         |    7 +-
 .../PackingListLine_view/my_quantity.xml      |    7 +-
 .../PackingListLine_view/my_quantity_unit.xml |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../PackingListLine_view/my_title.xml         |    7 +-
 .../my_variation_category_list.xml            |    7 +-
 .../PackingListLine_view/total_price.xml      |    7 +-
 .../PackingListLine_view/total_quantity.xml   |    7 +-
 .../PackingList_copyOrderProperties.xml       |    7 +-
 .../erp5_trade/PackingList_doSolveActions.xml |    7 +-
 ...ckingList_viewDateWorkflowActionDialog.xml |    7 +-
 .../PackingList_viewSolveActionsDialog.xml    |    7 +-
 .../erp5_trade/PaymentCondition_view.xml      |    7 +-
 .../my_destination_payment.xml                |    7 +-
 .../PaymentCondition_view/my_efficiency.xml   |    7 +-
 .../PaymentCondition_view/my_payment_date.xml |    7 +-
 .../PaymentCondition_view/my_quantity.xml     |    7 +-
 .../my_source_payment.xml                     |    7 +-
 ...chaseOrderModule_viewPurchaseOrderList.xml |    7 +-
 ...chaseOrder_applyPurchaseTradeCondition.xml |    8 +-
 .../PurchaseOrder_selectMovement.xml          |    7 +-
 .../erp5_trade/PurchaseOrder_view.xml         |    7 +-
 .../PurchaseOrder_view/my_comment.xml         |   13 +-
 .../PurchaseOrder_view/my_delivery_mode.xml   |   13 +-
 .../my_destination_administration_title.xml   |   13 +-
 .../my_destination_section_title.xml          |   13 +-
 .../PurchaseOrder_view/my_incoterm.xml        |   13 +-
 .../PurchaseOrder_view/my_order.xml           |   13 +-
 .../PurchaseOrder_view/my_origin.xml          |   13 +-
 .../PurchaseOrder_view/my_price_currency.xml  |   13 +-
 .../my_source_administration_title.xml        |   13 +-
 .../PurchaseOrder_view/my_source_title.xml    |   13 +-
 .../PurchaseOrder_view/my_start_date.xml      | 1669 ++++++++++++++++-
 .../PurchaseOrder_view/my_stop_date.xml       | 1669 ++++++++++++++++-
 .../PurchaseOrder_view/my_title.xml           |   13 +-
 .../my_trade_condition_title.xml              |    7 +-
 .../PurchaseOrder_view/simulation_state.xml   |   13 +-
 ...ListModule_viewPurchasePackingListList.xml |    7 +-
 ...urchasePackingList_copyOrderProperties.xml |    7 +-
 .../erp5_trade/PurchasePackingList_view.xml   |    7 +-
 .../immobilisation_state.xml                  |    7 +-
 .../PurchasePackingList_view/listbox.xml      |    7 +-
 .../my_causality_state.xml                    |    7 +-
 .../my_causality_title.xml                    |    7 +-
 .../PurchasePackingList_view/my_comment.xml   |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../PurchasePackingList_view/my_incoterm.xml  |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../my_start_date.xml                         |    7 +-
 .../PurchasePackingList_view/my_stop_date.xml |    7 +-
 .../PurchasePackingList_view/my_title.xml     |    7 +-
 .../simulation_state.xml                      |    7 +-
 .../erp5_trade/PurchaseSupplyLine_init.xml    |    7 +-
 .../erp5_trade/PurchaseSupplyLine_view.xml    |    7 +-
 .../my_additional_price.xml                   |    7 +-
 .../PurchaseSupplyLine_view/my_base_price.xml |    7 +-
 .../PurchaseSupplyLine_view/my_comment.xml    |    7 +-
 .../my_discount_ratio.xml                     |    7 +-
 .../my_exclusive_discount_ratio.xml           |    7 +-
 .../my_non_discountable_additional_price.xml  |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_surcharge_ratio.xml                    |    7 +-
 .../my_variable_additional_price.xml          |    7 +-
 .../PurchaseSupplyLine_viewBasePrice.xml      |    7 +-
 ...aseSupplyModule_viewPurchaseSupplyList.xml |    7 +-
 .../erp5_trade/PurchaseSupply_view.xml        |    7 +-
 .../PurchaseSupply_view/my_description.xml    |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../PurchaseSupply_view/my_price_currency.xml |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../PurchaseSupply_view/my_title.xml          |    7 +-
 ...nModule_viewPurchaseTradeConditionList.xml |    7 +-
 .../PurchaseTradeCondition_asPredicate.xml    |    7 +-
 .../PurchaseTradeCondition_view.xml           |    7 +-
 .../my_activity.xml                           |    7 +-
 .../my_comment.xml                            |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_description.xml                        |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_effective_date.xml                     |    7 +-
 .../my_expiration_date.xml                    |    7 +-
 .../PurchaseTradeCondition_view/my_group.xml  |    7 +-
 .../my_incoterm.xml                           |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../PurchaseTradeCondition_view/my_title.xml  |    7 +-
 .../PurchaseTradeCondition_viewProfile.xml    |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_decision_title.xml         |    7 +-
 .../my_destination_payment_title.xml          |    7 +-
 .../my_destination_project_title.xml          |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_decision_title.xml              |    7 +-
 .../my_source_payment_title.xml               |    7 +-
 .../my_source_project_title.xml               |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../Resource_getDefaultPurchaseSupplyLine.xml |    7 +-
 .../Resource_getDefaultSupplyLine.xml         |    7 +-
 ...Resource_viewDefaultPurchaseSupplyLine.xml |    7 +-
 .../Resource_viewDefaultSupplyLine.xml        |    7 +-
 ...esource_viewDefaultSupplyLineReference.xml |    7 +-
 ...Module_viewReturnedSalePackingListList.xml |    7 +-
 .../ReturnedSalePackingList_view.xml          |    7 +-
 .../SaleOrderModule_viewSaleOrderList.xml     |    7 +-
 .../SaleOrder_applySaleTradeCondition.xml     |    7 +-
 .../erp5_trade/SaleOrder_selectMovement.xml   |    7 +-
 .../erp5_trade/SaleOrder_view.xml             |    7 +-
 .../erp5_trade/SaleOrder_view/my_comment.xml  |    7 +-
 .../SaleOrder_view/my_delivery_mode.xml       |    7 +-
 .../my_destination_decision_title.xml         |    7 +-
 .../my_destination_reference.xml              |    7 +-
 .../SaleOrder_view/my_destination_title.xml   |    7 +-
 .../SaleOrder_view/my_errand_ratio.xml        |    7 +-
 .../erp5_trade/SaleOrder_view/my_group.xml    |    7 +-
 .../erp5_trade/SaleOrder_view/my_incoterm.xml |    7 +-
 .../erp5_trade/SaleOrder_view/my_order.xml    |    7 +-
 .../erp5_trade/SaleOrder_view/my_origin.xml   |    7 +-
 .../SaleOrder_view/my_price_currency.xml      |    7 +-
 .../SaleOrder_view/my_received_date.xml       |    7 +-
 .../SaleOrder_view/my_segmentation.xml        |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_decision_title.xml              |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../SaleOrder_view/my_start_date.xml          |    7 +-
 .../SaleOrder_view/my_stop_date.xml           |    7 +-
 .../erp5_trade/SaleOrder_view/my_title.xml    |    7 +-
 .../my_trade_condition_title.xml              |    7 +-
 .../SaleOrder_view/simulation_state.xml       |    7 +-
 ...kingListModule_viewSalePackingListList.xml |    7 +-
 .../SalePackingList_copyOrderProperties.xml   |    7 +-
 .../erp5_trade/SalePackingList_fastInput.xml  |    8 +-
 .../SalePackingList_fastInputForm.xml         |    7 +-
 .../erp5_trade/SalePackingList_view.xml       |    7 +-
 .../immobilisation_state.xml                  |    7 +-
 .../SalePackingList_view/listbox.xml          |    7 +-
 .../my_causality_state.xml                    |    7 +-
 .../my_causality_title.xml                    |    7 +-
 .../SalePackingList_view/my_comment.xml       |    7 +-
 .../my_container_state.xml                    |    7 +-
 .../SalePackingList_view/my_delivery_mode.xml |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../SalePackingList_view/my_incoterm.xml      |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../SalePackingList_view/my_source_title.xml  |    7 +-
 .../SalePackingList_view/my_start_date.xml    |    7 +-
 .../SalePackingList_view/my_stop_date.xml     |    7 +-
 .../SalePackingList_view/my_title.xml         |    7 +-
 .../SalePackingList_view/simulation_state.xml |    7 +-
 .../SalePackingList_viewContainerList.xml     |    7 +-
 .../my_causality_state.xml                    |    7 +-
 .../my_causality_title.xml                    |    7 +-
 .../my_comment.xml                            |    7 +-
 .../my_container_state.xml                    |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_incoterm.xml                           |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../my_start_date.xml                         |    7 +-
 .../my_stop_date.xml                          |    7 +-
 .../my_title.xml                              |    7 +-
 .../simulation_state.xml                      |    7 +-
 .../erp5_trade/SaleSupplyLine_init.xml        |    7 +-
 .../erp5_trade/SaleSupplyLine_view.xml        |    7 +-
 .../my_additional_price.xml                   |    7 +-
 .../SaleSupplyLine_view/my_base_price.xml     |    7 +-
 .../SaleSupplyLine_view/my_comment.xml        |    7 +-
 .../SaleSupplyLine_view/my_discount_ratio.xml |    7 +-
 .../my_exclusive_discount_ratio.xml           |    7 +-
 .../my_non_discountable_additional_price.xml  |    7 +-
 .../SaleSupplyLine_view/my_price_currency.xml |    7 +-
 .../SaleSupplyLine_view/my_quantity_unit.xml  |    7 +-
 .../my_surcharge_ratio.xml                    |    7 +-
 .../my_variable_additional_price.xml          |    7 +-
 .../SaleSupplyLine_viewAdditionalPrice.xml    |    7 +-
 .../my_additional_price.xml                   |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_priced_quantity.xml                    |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 .../SaleSupplyLine_viewBasePrice.xml          |    7 +-
 .../my_base_price.xml                         |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_priced_quantity.xml                    |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 .../SaleSupplyLine_viewDiscountRatio.xml      |    7 +-
 .../my_discount_ratio.xml                     |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_priced_quantity.xml                    |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 ...eSupplyLine_viewExclusiveDiscountRatio.xml |    7 +-
 .../my_exclusive_discount_ratio.xml           |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_priced_quantity.xml                    |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 ...ine_viewNonDiscountableAdditionalPrice.xml |    7 +-
 .../my_non_discountable_additional_price.xml  |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../SaleSupplyLine_viewSurchargeRatio.xml     |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_priced_quantity.xml                    |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_resource_title.xml                     |    7 +-
 .../my_start_date_range_max.xml               |    7 +-
 .../my_surcharge_ratio.xml                    |    7 +-
 ...SupplyLine_viewVariableAdditionalPrice.xml |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_quantity_unit.xml                      |    7 +-
 .../my_variable_additional_price.xml          |    7 +-
 .../SaleSupplyModule_viewSaleSupplyList.xml   |    7 +-
 .../erp5_trade/SaleSupply_view.xml            |    7 +-
 .../SaleSupply_view/my_description.xml        |    7 +-
 .../SaleSupply_view/my_destination_title.xml  |    7 +-
 .../SaleSupply_view/my_price_currency.xml     |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../erp5_trade/SaleSupply_view/my_title.xml   |    7 +-
 ...itionModule_viewSaleTradeConditionList.xml |    7 +-
 .../SaleTradeCondition_asPredicate.xml        |    7 +-
 .../erp5_trade/SaleTradeCondition_view.xml    |    7 +-
 .../SaleTradeCondition_view/my_activity.xml   |    7 +-
 .../SaleTradeCondition_view/my_comment.xml    |    7 +-
 .../my_delivery_mode.xml                      |    7 +-
 .../my_description.xml                        |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_effective_date.xml                     |    7 +-
 .../my_expiration_date.xml                    |    7 +-
 .../SaleTradeCondition_view/my_group.xml      |    7 +-
 .../SaleTradeCondition_view/my_incoterm.xml   |    7 +-
 .../my_price_currency.xml                     |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../SaleTradeCondition_view/my_title.xml      |    7 +-
 .../SaleTradeCondition_viewProfile.xml        |    7 +-
 .../my_destination_administration_title.xml   |    7 +-
 .../my_destination_decision_title.xml         |    7 +-
 .../my_destination_payment_title.xml          |    7 +-
 .../my_destination_section_title.xml          |    7 +-
 .../my_destination_title.xml                  |    7 +-
 .../my_source_administration_title.xml        |    7 +-
 .../my_source_decision_title.xml              |    7 +-
 .../my_source_payment_title.xml               |    7 +-
 .../my_source_section_title.xml               |    7 +-
 .../my_source_title.xml                       |    7 +-
 .../erp5_trade/SupplyCell_asPredicate.xml     |    7 +-
 ...yCell_getLocalPredicatePropertyDict%20.xml |    7 +-
 .../erp5_trade/SupplyLine_asCellRange.xml     |    7 +-
 .../erp5_trade/SupplyLine_asPredicate.xml     |    7 +-
 .../erp5_trade/SupplyLine_init.xml            |    7 +-
 .../erp5_trade/SupplyLine_view.xml            |    7 +-
 .../my_non_discountable_additional_price.xml  |    7 +-
 .../my_variable_additional_price.xml          |    7 +-
 .../SupplyLine_viewAdditionalPrice.xml        |    7 +-
 .../erp5_trade/SupplyLine_viewBasePrice.xml   |    7 +-
 .../SupplyLine_viewDiscountRatio.xml          |    7 +-
 .../SupplyLine_viewExclusiveDiscountRatio.xml |    7 +-
 ...ine_viewNonDiscountableAdditionalPrice.xml |    7 +-
 .../erp5_trade/SupplyLine_viewReference.xml   |    7 +-
 .../SupplyLine_viewSurchargeRatio.xml         |    7 +-
 ...SupplyLine_viewVariableAdditionalPrice.xml |    7 +-
 .../SupplyModule_viewSupplyList.xml           |    7 +-
 .../portal_skins/erp5_trade/Supply_view.xml   |    7 +-
 .../erp5_trade/Supply_view/listbox.xml        |    7 +-
 .../erp5_trade/TradeCondition_getDueDate.xml  |    8 +-
 ...ondition_getLocalPredicatePropertyDict.xml |    7 +-
 .../TradeCondition_viewDiscount.xml           |    7 +-
 .../TradeCondition_viewDiscount/my_title.xml  |    7 +-
 .../erp5_trade/TradeCondition_viewPayment.xml |    7 +-
 ..._payment_condition_destination_payment.xml |    7 +-
 .../my_payment_condition_efficiency.xml       |    7 +-
 .../my_payment_condition_payment_date.xml     |    7 +-
 .../my_payment_condition_quantity.xml         |    7 +-
 .../my_payment_condition_source_payment.xml   |    7 +-
 .../TradeCondition_viewPayment/my_title.xml   |    7 +-
 .../delivery_edit_workflow.xml                |    7 +-
 .../delivery_edit_workflow/interactions.xml   |    7 +-
 ...eryCell_edit_UpdateSimulation%20%20%20.xml |    7 +-
 .../DeliveryLine_edit_UpdateSimulation.xml    |    7 +-
 ...lationState_ReindexSimulation%20%20%20.xml |    7 +-
 .../Delivery_edit_UpdateSimulation.xml        |    7 +-
 .../delivery_edit_workflow/scripts.xml        |    7 +-
 .../scripts/DeliveryCell_UpdateSimulation.xml |    7 +-
 .../scripts/DeliveryLine_UpdateSimulation.xml |    7 +-
 ...ivery_ReindexRelatedSimulationMovement.xml |    7 +-
 .../scripts/Delivery_UpdateSimulation.xml     |    7 +-
 .../delivery_edit_workflow/variables.xml      |    7 +-
 .../delivery_edit_workflow/worklists.xml      |    7 +-
 .../internal_packing_list_workflow.xml        |    7 +-
 .../scripts.xml                               |    7 +-
 .../internal_packing_list_workflow/states.xml |    7 +-
 .../states/delivered.xml                      |    7 +-
 .../transitions.xml                           |    7 +-
 .../variables.xml                             |    7 +-
 .../variables/action.xml                      |    7 +-
 .../variables/actor.xml                       |    7 +-
 .../variables/comment.xml                     |    7 +-
 .../variables/history.xml                     |    7 +-
 .../variables/portal_type.xml                 |    7 +-
 .../variables/time.xml                        |    7 +-
 .../worklists.xml                             |    7 +-
 .../portal_workflow/inventory_workflow.xml    |    7 +-
 .../inventory_workflow/scripts.xml            |   13 +-
 .../scripts/validateConsistency.xml           |  181 ++
 .../inventory_workflow/states.xml             |    7 +-
 .../inventory_workflow/states/deleted.xml     |  102 +
 .../inventory_workflow/states/delivered.xml   |    7 +-
 .../inventory_workflow/states/draft.xml       |    9 +-
 .../inventory_workflow/transitions.xml        |    7 +-
 .../inventory_workflow/transitions/delete.xml |   67 +
 .../transitions/delete_action.xml             |   88 +
 .../transitions/deliver.xml                   |    7 +-
 .../transitions/deliver_action.xml            |   17 +-
 .../inventory_workflow/variables.xml          |    7 +-
 .../inventory_workflow/variables/action.xml   |    7 +-
 .../inventory_workflow/variables/actor.xml    |    7 +-
 .../inventory_workflow/variables/comment.xml  |    7 +-
 .../variables/error_message.xml               |    7 +-
 .../inventory_workflow/variables/history.xml  |    7 +-
 .../inventory_workflow/variables/time.xml     |    7 +-
 .../inventory_workflow/worklists.xml          |    7 +-
 .../portal_workflow/order_workflow.xml        |    7 +-
 .../order_workflow/scripts.xml                |    7 +-
 .../Order_appliedToRelatedMovement.xml        |    7 +-
 .../scripts/Order_buildPackingList.xml        |    7 +-
 .../scripts/Order_createOrderRule.xml         |    7 +-
 .../scripts/Order_validateData.xml            |    7 +-
 .../portal_workflow/order_workflow/states.xml |    7 +-
 .../order_workflow/states/auto_planned.xml    |    7 +-
 .../order_workflow/states/cancelled.xml       |    7 +-
 .../order_workflow/states/confirmed.xml       |    7 +-
 .../order_workflow/states/draft.xml           |    7 +-
 .../order_workflow/states/ordered.xml         |    7 +-
 .../order_workflow/states/planned.xml         |    7 +-
 .../order_workflow/transitions.xml            |    7 +-
 .../order_workflow/transitions/auto_plan.xml  |    7 +-
 .../order_workflow/transitions/cancel.xml     |    7 +-
 .../transitions/cancel_action.xml             |    7 +-
 .../order_workflow/transitions/confirm.xml    |    7 +-
 .../transitions/confirm_action.xml            |    7 +-
 .../transitions/informDeliveryList.xml        |    7 +-
 .../order_workflow/transitions/order.xml      |    7 +-
 .../transitions/order_action.xml              |    7 +-
 .../order_workflow/transitions/plan.xml       |    7 +-
 .../transitions/plan_action.xml               |    7 +-
 .../order_workflow/variables.xml              |    7 +-
 .../order_workflow/variables/action.xml       |    7 +-
 .../order_workflow/variables/actor.xml        |    7 +-
 .../order_workflow/variables/comment.xml      |    7 +-
 .../variables/error_message.xml               |    7 +-
 .../order_workflow/variables/history.xml      |    7 +-
 .../order_workflow/variables/portal_type.xml  |    7 +-
 .../order_workflow/variables/start_date.xml   |    7 +-
 .../order_workflow/variables/stop_date.xml    |    7 +-
 .../order_workflow/variables/time.xml         |    7 +-
 .../order_workflow/worklists.xml              |    7 +-
 .../worklists/draft_purchase.xml              |    7 +-
 .../order_workflow/worklists/draft_sale.xml   |    7 +-
 .../worklists/ordered_purchase.xml            |    7 +-
 .../order_workflow/worklists/ordered_sale.xml |    7 +-
 .../worklists/planned_purchase.xml            |    7 +-
 .../order_workflow/worklists/planned_sale.xml |    7 +-
 .../packing_list_causality_workflow.xml       |    7 +-
 .../scripts.xml                               |    7 +-
 .../scripts/PackingList_acceptDecision.xml    |    7 +-
 .../scripts/PackingList_adoptPrevision.xml    |    7 +-
 .../scripts/PackingList_afterEdit.xml         |    7 +-
 ...ckingList_callSplitPrevisionTransition.xml |    7 +-
 .../scripts/PackingList_split.xml             |    7 +-
 .../states.xml                                |    7 +-
 .../states/building.xml                       |    7 +-
 .../states/calculating.xml                    |    7 +-
 .../states/diverged.xml                       |    7 +-
 .../states/draft.xml                          |    7 +-
 .../states/solved.xml                         |    7 +-
 .../states/solving.xml                        |    7 +-
 .../transitions.xml                           |    7 +-
 .../transitions/accept_decision.xml           |    7 +-
 .../transitions/accept_decision_action.xml    |    7 +-
 .../transitions/adopt_prevision.xml           |    7 +-
 .../transitions/adopt_prevision_action.xml    |    7 +-
 .../transitions/converge.xml                  |    7 +-
 .../transitions/diverge.xml                   |    7 +-
 .../transitions/edit.xml                      |    7 +-
 .../transitions/split_prevision.xml           |    7 +-
 .../transitions/split_prevision_action.xml    |    7 +-
 .../transitions/start_building.xml            |    7 +-
 .../variables.xml                             |    7 +-
 .../variables/action.xml                      |    7 +-
 .../variables/actor.xml                       |    7 +-
 .../variables/comment.xml                     |    7 +-
 .../variables/history.xml                     |    7 +-
 .../variables/portal_type.xml                 |    7 +-
 .../variables/start_date.xml                  |    7 +-
 .../variables/stop_date.xml                   |    7 +-
 .../variables/time.xml                        |    7 +-
 .../worklists.xml                             |    7 +-
 .../packing_list_container_workflow.xml       |    7 +-
 .../scripts.xml                               |    7 +-
 ...st_updateQuantityFromContainerQuantity.xml |    7 +-
 .../states.xml                                |    7 +-
 .../states/missing.xml                        |    7 +-
 .../states/packed.xml                         |    7 +-
 .../transitions.xml                           |    7 +-
 .../transitions/edit.xml                      |    7 +-
 .../transitions/miss.xml                      |    7 +-
 .../transitions/pack.xml                      |    7 +-
 .../transitions/update_quantity.xml           |    7 +-
 .../transitions/update_quantity_action.xml    |    7 +-
 .../variables.xml                             |    7 +-
 .../variables/action.xml                      |    7 +-
 .../variables/actor.xml                       |    7 +-
 .../variables/comment.xml                     |    7 +-
 .../variables/history.xml                     |    7 +-
 .../variables/portal_type.xml                 |    7 +-
 .../variables/start_date.xml                  |    7 +-
 .../variables/stop_date.xml                   |    7 +-
 .../variables/time.xml                        |    7 +-
 .../worklists.xml                             |    7 +-
 .../packing_list_interaction_workflow.xml     |    7 +-
 .../interactions.xml                          |    7 +-
 .../interactions/Container_delete.xml         |    7 +-
 .../interactions/Container_edit.xml           |    7 +-
 .../PackingListContent_delete.xml             |    7 +-
 .../interactions/PackingListContent_edit.xml  |    7 +-
 .../interactions/PackingList_edit.xml         |    7 +-
 .../scripts.xml                               |    7 +-
 ...ntainer_activateUpdatePackingListState.xml |    7 +-
 .../Container_updatePackingListState.xml      |    7 +-
 .../PackingListContent_beforeDelete.xml       |    7 +-
 ...kingListContent_updatePackingListState.xml |    7 +-
 .../scripts/PackingList_updateAppliedRule.xml |    7 +-
 .../variables.xml                             |    7 +-
 .../worklists.xml                             |    7 +-
 .../portal_workflow/packing_list_workflow.xml |    7 +-
 .../packing_list_workflow/scripts.xml         |    7 +-
 .../scripts/PackingList_buildInvoice.xml      |    7 +-
 .../scripts/PackingList_updateAppliedRule.xml |    7 +-
 .../packing_list_workflow/states.xml          |    7 +-
 .../states/cancelled.xml                      |    7 +-
 .../states/confirmed.xml                      |    7 +-
 .../states/delivered.xml                      |    7 +-
 .../packing_list_workflow/states/draft.xml    |    7 +-
 .../packing_list_workflow/states/ready.xml    |    7 +-
 .../packing_list_workflow/states/started.xml  |    7 +-
 .../packing_list_workflow/states/stopped.xml  |    7 +-
 .../packing_list_workflow/transitions.xml     |    7 +-
 .../transitions/cancel.xml                    |    7 +-
 .../transitions/cancel_action.xml             |    7 +-
 .../transitions/confirm.xml                   |    7 +-
 .../transitions/confirm_action.xml            |    7 +-
 .../transitions/deliver.xml                   |    7 +-
 .../transitions/deliver_action.xml            |    7 +-
 .../transitions/set_ready.xml                 |    7 +-
 .../transitions/set_ready_action.xml          |    7 +-
 .../transitions/start.xml                     |    7 +-
 .../transitions/start_action.xml              |    7 +-
 .../transitions/stop.xml                      |    7 +-
 .../transitions/stop_action.xml               |    7 +-
 .../packing_list_workflow/variables.xml       |    7 +-
 .../variables/action.xml                      |    7 +-
 .../packing_list_workflow/variables/actor.xml |    7 +-
 .../variables/comment.xml                     |    7 +-
 .../variables/history.xml                     |    7 +-
 .../variables/portal_type.xml                 |    7 +-
 .../variables/start_date.xml                  |    7 +-
 .../variables/stop_date.xml                   |    7 +-
 .../packing_list_workflow/variables/time.xml  |    7 +-
 .../packing_list_workflow/worklists.xml       |    7 +-
 .../supply_line_interaction_workflow.xml      |    7 +-
 .../interactions.xml                          |    7 +-
 .../SupplyLine_changeAdditionalPriceRange.xml |    7 +-
 .../SupplyLine_changeBasePriceRange.xml       |    7 +-
 .../SupplyLine_changeDiscountRatioRange.xml   |    7 +-
 ...Line_changeExclusiveDiscountRatioRange.xml |    7 +-
 ...ngeNonDiscountableAdditionalPriceRange.xml |    7 +-
 .../SupplyLine_changeSurchargeRatio.xml       |    7 +-
 ...ine_changeVariableAdditionalPriceRange.xml |    7 +-
 .../scripts.xml                               |    7 +-
 .../SupplyLine_updateBasePriceCellRange.xml   |    7 +-
 ...upplyLine_updateDiscountRatioCellRange.xml |    7 +-
 ..._updateExclusiveDiscountRatioCellRange.xml |    7 +-
 ...updateOptionalAdditionalPriceCellRange.xml |    7 +-
 ...e_updateOptionalDiscountRatioCellRange.xml |    7 +-
 ...ptionalExclusiveDiscountRatioCellRange.xml |    7 +-
 ...onDiscountableAdditionalPriceCellRange.xml |    7 +-
 ..._updateOptionalSurchargeRatioCellRange.xml |    7 +-
 ...tionalVariableAdditionalPriceCellRange.xml |    7 +-
 ...pplyLine_updateSurchargeRatioCellRange.xml |    7 +-
 .../variables.xml                             |    7 +-
 .../worklists.xml                             |    7 +-
 .../portal_workflow/trade_matrix_workflow.xml |    7 +-
 .../trade_matrix_workflow/interactions.xml    |    7 +-
 .../interactions/setVariationCategoryList.xml |    7 +-
 .../trade_matrix_workflow/scripts.xml         |    7 +-
 .../scripts/DeliveryLine_updateCellRange.xml  |    7 +-
 .../trade_matrix_workflow/variables.xml       |    7 +-
 .../trade_matrix_workflow/worklists.xml       |    7 +-
 bt5/erp5_trade/bt/revision                    |    2 +-
 bt5/erp5_trade/bt/template_constraint_id_list |    1 +
 .../template_portal_type_property_sheet_list  |    1 +
 1104 files changed, 7760 insertions(+), 7642 deletions(-)
 create mode 100644 bt5/erp5_trade/ConstraintTemplateItem/DuplicateInventory.py
 create mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts/validateConsistency.xml
 create mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/deleted.xml
 create mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete.xml
 create mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete_action.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 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml
index dcfc63da5f..08859506b3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml
index abbb1acffe..57803abac2 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml
index 65fccc7506..d99840455b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml
index 760f443706..485cc99472 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
index d660c62ee6..57f71d2ae4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml
index 890eb3c66e..ea4f1aff82 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
index f31068668a..01b44baba1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml
index 369ed718a6..64e0c954df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
index 211f4191ca..d3257e3716 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml
index 369ed718a6..64e0c954df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/history.xml
index 7967a23223..cd08777edc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml
index d5d874fbc3..9665cab34c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml
index 8614a6991d..17860e0441 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
index 97da81ac4e..16c8d462c9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml
index d54a254eb9..17e1d3b1bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml
index 8836a5bada..587f56a411 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Discount/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/history.xml
index 20592e1ec8..bf795ce633 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/metadata.xml
index bb0ddd9d25..6dea7f98cd 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/print.xml
index 621cfd9ad1..3cf0fb6c76 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/print.xml
index b0646266af..00f6263741 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 42d7040078..bbf4784a6d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
index 18133b29c7..33546510c9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 11c5591182..0d3c46b9fc 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_export.xml
index ffaadf57de..c3d41bb82b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_import.xml
index 37dd929b1d..bcd04c89ff 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/csv_import.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/list_ui.xml
index cf88522122..b29560ad5b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/print.xml
index 8614a6991d..17860e0441 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/search.xml
index 01752b41c3..38d9bb2d2e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/sort_on.xml
index 4b00418f4b..ea0da7c66a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
index c7ea916997..0370b00094 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
index 9a0c191ba8..33755b8480 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml
index 16b38d9900..f4cd58177f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml
index c631122351..216af5efdc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml
index 8614a6991d..17860e0441 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
index 2f1790f221..1848b01ec3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml
index 369ed718a6..64e0c954df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
index 7b86ba825d..e0292abed8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
index 9e02886166..08e514128d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
index eb20d58d40..2a355b9ca4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
index b0646266af..00f6263741 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
index dab2a2d6bb..1944185757 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml
index 32f48e91cc..79acf4adad 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/csv_import.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml
index 148cde5cb6..e71f93ec84 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
index a4232eff49..f5162a31e0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml
index d54a254eb9..17e1d3b1bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
index a91e4749a1..3ab2f37364 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/history.xml
index 7967a23223..cd08777edc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml
index d5d874fbc3..9665cab34c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml
index f871a92fc4..d738ed1bb6 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
index 97da81ac4e..16c8d462c9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
index a028c2c818..4965e0f8e6 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +89,8 @@ string:${portal_url}/purchase_order_module/view?reset:int=1&default_source_title
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 bba6d21df1..73c1729231 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +89,8 @@ string:${portal_url}/purchase_packing_list_module/view?reset:int=1&default_sourc
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
index 3054452be2..327885ebaa 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +89,8 @@ string:${portal_url}/sale_order_module/view?reset:int=1&default_destination_titl
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 d6ed42e1a0..97535bc1d7 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +89,8 @@ string:${portal_url}/sale_packing_list_module/view?reset:int=1&default_destinati
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml
index 2e6965f167..7d1c1ff1ea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml
index 65fccc7506..d99840455b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml
index a1393d8768..4d2d47de1c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
index 1c6d919412..cbf337d3b5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
index fce7b64f85..4f38210225 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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
index f8e453ef73..c32d2e62f6 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
index 3ff6077be9..6ff1bfb895 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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
index c70367cf82..30368ddd40 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/history.xml
index 20592e1ec8..bf795ce633 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/metadata.xml
index bb0ddd9d25..6dea7f98cd 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/print.xml
index 621cfd9ad1..3cf0fb6c76 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
index 2f52fa6256..cc2e9d15d1 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml
index b0646266af..00f6263741 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
index 42d7040078..bbf4784a6d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
index 3e70b1d83c..a639618192 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/csv_import.xml
index 32f48e91cc..79acf4adad 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/list_ui.xml
index 148cde5cb6..e71f93ec84 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
index 64f990c8fd..f4952a5761 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/workflow_report.xml
index 84f07b42d8..00f41c4c06 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
index 5974573c45..4ce2a07e5c 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml
index 7967a23223..cd08777edc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 d37bc5a97a..82cdf74112 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
index 919165fa3e..49b94c845c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
index 42a1e682c9..ae32b6fcf8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml
index e64988d889..6f01d4baae 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
index 2a693e1fa3..4b5aedaefe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
index 66be2608f2..4b144489a1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml
index 50405be293..12a1fb9496 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_discount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 3c518a75fd..f15d363492 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 369ed718a6..64e0c954df 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/print.xml
index 6ce6cc1220..caf335eb14 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 c3039c5dd4..9fd9ac1fd1 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/print.xml
index b0646266af..00f6263741 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 42d7040078..bbf4784a6d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
index 18133b29c7..33546510c9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 11c5591182..0d3c46b9fc 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 32f48e91cc..79acf4adad 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 df7300fc01..33c33428bb 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
index 4c3bd92094..8d6441e446 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 84f07b42d8..00f41c4c06 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/choose_solve_actions.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/choose_solve_actions.xml
index ec2b76841d..3d084c1d81 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/choose_solve_actions.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/choose_solve_actions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml
index d54a254eb9..17e1d3b1bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 6af7e14999..f84dbb70cb 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_order.xml
index 10b6325fb6..221e6d82f1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +89,8 @@ string:${object_url}/Base_jumpToRelationObject?base_category=causality&portal_ty
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
index d9c282ddb0..c396226cfc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/history_view.xml
index 379c1ae9dd..a1d230521d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/metadata.xml
index c631122351..216af5efdc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/print.xml
index 8614a6991d..17860e0441 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/view.xml
index d8c896c163..c6db4625cf 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/additional_price.xml
index f5a5b3851d..a97c5ebc9c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/base_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/base_price.xml
index 06bf83fbff..e23e55bfe9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/base_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/discount_ratio.xml
index 59fb3d6804..d6f0e5d0e1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/exclusive_discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/exclusive_discount_ratio.xml
index 7af9fb3a9a..ae89cf9c76 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/exclusive_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/history_view.xml
index df83a9fdd7..0dd9d777fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/metadata_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/metadata_view.xml
index a8a7630c31..59124f77d8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/metadata_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/metadata_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/non_discountable__additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/non_discountable__additional_price.xml
index 2051b8025f..f3ec8513db 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/non_discountable__additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/non_discountable__additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/print.xml
index 0ae8ce85e9..a366c1309b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/surcharge_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/surcharge_ratio.xml
index 55efe7ccbe..ece2a941b5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/surcharge_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/variable_additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/variable_additional_price.xml
index 4637a415be..823ce1f560 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/variable_additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/view.xml
index e8a02d7b42..2940d240e9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/list_ui.xml
index 319f5c5970..66954514c3 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/search.xml
index 11c5949ed5..55c9d3de37 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml
index 8da5c69120..355cd97a05 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml
index d54a254eb9..17e1d3b1bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml
index 9d94523201..437c80150e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Supply/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 3a339e34bc..c913729b74 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 d5deb659b1..4bb0a86ac8 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 319f5c5970..66954514c3 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/search.xml
index 844ad76c4c..9c11a1f3ae 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
index 4bd90aa4c0..c4d6082ea2 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 a2a3cd9137..6e8e7827db 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml
index 919165fa3e..49b94c845c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml
index e64988d889..6f01d4baae 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
index 862d71f9bf..8ee2695631 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_discount.xml
index 50405be293..12a1fb9496 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_history.xml
index f53eed9535..9d676974af 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
index 1f9ba96901..28ef03f3af 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
index 8b7b330b52..6356fe1e1d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/history_view.xml
index 369ed718a6..64e0c954df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
index 2f52fa6256..cc2e9d15d1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/print.xml
index b0646266af..00f6263741 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
index 42d7040078..bbf4784a6d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
index 18133b29c7..33546510c9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_import.xml
index 32f48e91cc..79acf4adad 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_import.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/csv_import.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/list_ui.xml
index df7300fc01..33c33428bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/list_ui.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/sort_on.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
index b342c86df6..175ec694fd 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
index 84f07b42d8..00f41c4c06 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/choose_solve_actions.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/choose_solve_actions.xml
index 94c7108152..4936b3a1e5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/choose_solve_actions.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/choose_solve_actions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/history.xml
index 2e6965f167..7d1c1ff1ea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
index c3a655038a..ccd1b6cd0e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/metadata.xml
index 65fccc7506..d99840455b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/print.xml
index 760f443706..485cc99472 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
index 8d1d784869..c1bbce9e81 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/history.xml
index 20592e1ec8..bf795ce633 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/metadata.xml
index bb0ddd9d25..6dea7f98cd 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/print.xml
index 621cfd9ad1..3cf0fb6c76 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
index 2f52fa6256..cc2e9d15d1 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml
index b0646266af..00f6263741 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
index 42d7040078..bbf4784a6d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
index 3e70b1d83c..a639618192 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_import.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/csv_import.xml
index 32f48e91cc..79acf4adad 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/list_ui.xml
index 148cde5cb6..e71f93ec84 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
index 1cd5e3f4eb..8b5a791524 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
index 84f07b42d8..00f41c4c06 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
index 5c3d465851..e61ba06b6a 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml
index 6f8def5339..a9b1015257 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 df41142b06..b52b0cbdc6 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml
index 363291f6a0..531557f3c3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
index 42a1e682c9..ae32b6fcf8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml
index 320e9b240c..01bd0a8d0f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
index c60271eab1..7c183b1c55 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
index 3b4cfda907..b5d2679072 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml
index 50405be293..12a1fb9496 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_discount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
index 7dde3ba6db..3e5347bcaa 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 369ed718a6..64e0c954df 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/print.xml
index 6ce6cc1220..caf335eb14 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
index 55d016dda3..aaf39a2297 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/history.xml
index 6ddff8ee35..313d4b2fe9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/metadata.xml
index f4f1655d61..afee9c3694 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 2f52fa6256..cc2e9d15d1 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/print.xml
index b0646266af..00f6263741 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 42d7040078..bbf4784a6d 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
index 18133b29c7..33546510c9 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 32f48e91cc..79acf4adad 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 df7300fc01..33c33428bb 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
index e894615f00..110279396a 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 84f07b42d8..00f41c4c06 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 3da9503d13..55c06fd244 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 5c8af01a85..a8ba6d12a1 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml
index 2e6965f167..7d1c1ff1ea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 c3a655038a..ccd1b6cd0e 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml
index 65fccc7506..d99840455b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml
index 760f443706..485cc99472 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
index cf62c9e124..cbec5921d2 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 b36af1affe..43c21894b7 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/history_view.xml
index 379c1ae9dd..a1d230521d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/metadata.xml
index c631122351..216af5efdc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/print.xml
index 8614a6991d..17860e0441 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/view.xml
index d8c896c163..c6db4625cf 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/additional_price.xml
index f6bc1f43b1..8b3d189b50 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/base_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/base_price.xml
index 5c192dff56..71644f9f2d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/base_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/discount_ratio.xml
index 3330ee1898..6c02c7d562 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/exclusive_discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/exclusive_discount_ratio.xml
index 060851f797..412aa2e4a5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/exclusive_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/history_view.xml
index df83a9fdd7..0dd9d777fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/metadata_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/metadata_view.xml
index a8a7630c31..59124f77d8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/metadata_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/metadata_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/non_discountable__additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/non_discountable__additional_price.xml
index 7218d6f454..cee16173d9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/non_discountable__additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/non_discountable__additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/print.xml
index 0ae8ce85e9..a366c1309b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/surcharge_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/surcharge_ratio.xml
index 2ef1d11a35..d9ba686a2a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/surcharge_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/variable_additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/variable_additional_price.xml
index 1001d29799..3b9acbf0ea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/variable_additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/view.xml
index 7e9cace895..3bfe57f7b0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/csv_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/csv_export.xml
index df3dee7964..5608aea01b 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/list_ui.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/list_ui.xml
index 319f5c5970..66954514c3 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/search.xml
index 11c5949ed5..55c9d3de37 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/search.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/search.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/sort_on.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/sort_on.xml
index 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml
index 84f19fa029..c92e87a65d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml
index d54a254eb9..17e1d3b1bb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml
index 273fb9cb9c..8b71d32e75 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml
index 6ce6cc1220..caf335eb14 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml
index 13b1b80b7c..1fa37d5ff3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Supply/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 32f48e91cc..79acf4adad 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 3bbf66139c..30e7c15a8a 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 148cde5cb6..e71f93ec84 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/print.xml
index 6ce6cc1220..caf335eb14 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/search.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/search.xml
index b5e9ee59ec..f7b0792cef 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 844f84b37f..99880f65ba 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
index d6d480553b..3497d71733 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 84f07b42d8..00f41c4c06 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml
index 919165fa3e..49b94c845c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml
index e64988d889..6f01d4baae 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
index 207dcf0494..c11726b74b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_discount.xml
index 50405be293..12a1fb9496 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_history.xml
index f53eed9535..9d676974af 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
index 1f9ba96901..28ef03f3af 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
index da021fe867..4a6fdd7daa 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml
index 0cbb0aa716..3af9c91d2b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml
index d4da2c8f83..3ccac686ec 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml
index ba32d5f3c2..32d77a6336 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml
index ec90ba7c73..6a47db222c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml
index 9239746074..5e0c88ab9f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml
index e7db36b9f4..02d1563ce6 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml
index fd621e6523..eca3c23765 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/exclusive_discount_ratio.xml
index d6a29075bc..f3aa907bca 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml
index df83a9fdd7..0dd9d777fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/history_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml
index a8a7630c31..59124f77d8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/metadata_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/non_discountable__additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/non_discountable__additional_price.xml
index 7811fb5e83..48b0ab9f38 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/non_discountable__additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/non_discountable__additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml
index 0ae8ce85e9..a366c1309b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/print.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml
index 9a8423d6e6..037d5f27bc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/variable_additional_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/variable_additional_price.xml
index eab4f2782d..faacc214a4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/variable_additional_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml
index c7595c1399..a3cca916c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Supply%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
index 05bc8391ce..9868fb7b15 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -193,25 +190,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -219,13 +204,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml
index aa8e453218..aed3e37c6b 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -31,17 +28,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -50,20 +73,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>discount_type</string> </value>
+            <value> <string>discount_type</string> </value>
+        </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Discount Type</string> </value>
@@ -74,30 +177,24 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -105,13 +202,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
index a62e44ea52..a5cfc5cb35 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -201,25 +198,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -227,13 +212,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/payment_mode.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/payment_mode.xml
index 3ecfd20419..8cf84e4aaa 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/payment_mode.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/payment_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -191,25 +188,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -217,13 +202,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/segmentation.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/segmentation.xml
index 460d55cf43..d71eb7d337 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/segmentation.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/segmentation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -193,25 +190,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -219,13 +204,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_date.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_date.xml
index 9a98789d93..7230c45426 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_date.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -193,25 +190,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -219,13 +204,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/ConstraintTemplateItem/DuplicateInventory.py b/bt5/erp5_trade/ConstraintTemplateItem/DuplicateInventory.py
new file mode 100644
index 0000000000..be0a7e6998
--- /dev/null
+++ b/bt5/erp5_trade/ConstraintTemplateItem/DuplicateInventory.py
@@ -0,0 +1,122 @@
+##############################################################################
+#
+# Copyright (c) 2002-2007 Nexedi SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from Products.ERP5Type.Constraint import Constraint
+from zLOG import LOG
+
+class DuplicateInventory(Constraint):
+    """
+      We want to check here that there is not 2 or more inventories with:
+      - the same resource
+      - the same date
+      - the same node
+    """
+
+    def generateDuplicateError(self, portal, obj, resource, variation_text):
+      """
+        Use a single method in order to generate the message
+      """
+      resource_value = portal.restrictedTraverse(resource)
+      resource_title = resource_value.getTitle()
+      variation_description = ''
+      variation_title = ''
+      if len(variation_text) > 0:
+        variation_title_list = []
+        for variation in variation_text.split('\n'):
+          variation_value = portal.portal_categories\
+                                   .getCategoryValue(variation)
+          variation_title_list.append(variation_value.getTitle())
+        variation_title = ("(%s)" % ''.join(variation_title_list))
+        variation_description = "and variation $variation_title "
+      error_message = "%s%s%s" % \
+          ("There is already an inventory for $resource_title ",
+           variation_description, "on this node and date")
+      return self._generateError(obj, error_message,
+          mapping={'variation_title' : variation_title,
+                   'resource_title' : resource_title})
+
+    def checkConsistency(self, obj, fixit = 0):
+      """
+        Implement here the consistency checker
+        whenever fixit is not 0, object data should be updated to 
+        satisfy the constraint
+      """
+
+      errors = []
+
+      inventory = obj
+      node = inventory.getDestination()
+      node_value = inventory.getDestinationValue()
+      # Make sure to raise conflict error when two inventories are
+      # validated in the same time for the same node, this is the only
+      # way to make sure that it is impossible to validate two inventories
+      # in the same time (required because we have message with right tags
+      # only when the transaction is finished)
+      node_value.serialize()
+
+      # For each resource, we look that there is not any inventory for
+      # the same date, the same resource and the same node, or if there
+      # is already such kind of inventories being indexed
+      resource_and_variation_list = []
+      date = inventory.getStartDate()
+      date_string = repr(date)
+      countMessageWithTag = inventory.portal_activities.countMessageWithTag
+      portal = inventory.getPortalObject()
+      getObjectFromUid = portal.portal_catalog.getObject
+      getCurrentInventoryList = portal.portal_simulation.getCurrentInventoryList
+      resource_and_variation_list = []
+      for movement in inventory.getMovementList():
+        resource =  movement.getResource()
+        if resource is not None and movement.getQuantity() not in (None,''):
+          variation_text = movement.getVariationText()
+          if (resource,variation_text) not in resource_and_variation_list:
+            resource_and_variation_list.append((resource,variation_text))
+            tag = '%s_%s_%s' % (date_string, resource, variation_text)
+            if countMessageWithTag(tag) > 0 :
+              errors.append(self.generateDuplicateError(portal, obj, resource,
+                                    variation_text))
+            # Call sql request in order to see if there is another inventory
+            # for this node, resource, variation_text and date
+            inventory_list = getCurrentInventoryList(resource=resource,
+                                     variation_text=variation_text,
+                                     from_date=date, at_date=date,
+                                     node=node)
+            LOG('inventory_list sql src', 0, getCurrentInventoryList(resource=resource,
+              variation_text=variation_text,
+              from_date=date, at_date=date,
+              node=node, src__=1))
+            LOG('len inventory_list',0,len(inventory_list))
+            for inventory in inventory_list:
+              movement = getObjectFromUid(inventory.stock_uid)
+              if movement.getPortalType().find('Inventory') >= 0:
+                errors.append(self.generateDuplicateError(portal, obj, resource,
+                                    variation_text))
+          # Now we must reindex with some particular tags
+          activate_kw = {'tag': tag}
+          movement.reindexObject(activate_kw=activate_kw)
+      
+      return errors
diff --git a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
index 0c03ec5696..cd928dd39f 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
@@ -48,9 +48,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -76,6 +73,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -84,6 +84,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -224,6 +248,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -236,6 +263,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='list'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -256,10 +286,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='list'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -277,23 +303,21 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailMessages</name>
+   <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZODB Mount Points</name>
-   <role>Manager</role>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='list'>
    <name>Add Zope Tutorials</name>
@@ -323,6 +347,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='list'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -384,12 +414,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='list'>
    <name>Change bindings</name>
@@ -430,6 +455,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -450,6 +478,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -458,6 +489,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='list'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -560,15 +594,14 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connection</name>
-   <role>Manager</role>
+   <name>Move CMFWiki Page</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connections</name>
+   <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Post mail to ZMailIn</name>
+   <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
@@ -630,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -642,10 +678,6 @@
    <name>View History</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='list'>
    <name>View management screens</name>
    <role>SalesManager</role>
@@ -662,6 +694,12 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Internal Packing List Module</portal_type>
  <title>Internal Packing Lists</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
index 22dae36b1f..42c176bffb 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
@@ -48,9 +48,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -76,6 +73,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -84,6 +84,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -224,6 +248,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -236,6 +263,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='list'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -256,10 +286,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='list'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -277,23 +303,21 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailMessages</name>
+   <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZODB Mount Points</name>
-   <role>Manager</role>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='list'>
    <name>Add Zope Tutorials</name>
@@ -323,6 +347,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='list'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -384,12 +414,7 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='list'>
    <name>Change bindings</name>
@@ -430,6 +455,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -450,6 +478,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -458,6 +489,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='list'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -560,15 +594,14 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connection</name>
-   <role>Manager</role>
+   <name>Move CMFWiki Page</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connections</name>
+   <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Post mail to ZMailIn</name>
+   <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
@@ -630,6 +663,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -642,10 +678,6 @@
    <name>View History</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='list'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -662,6 +694,12 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Inventory Module</portal_type>
  <title>Inventories</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
index 4edd71a981..4c9591f1eb 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
@@ -63,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -91,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -99,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -239,6 +263,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -251,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -271,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -292,24 +318,22 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add Zope Schedulers</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -340,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -400,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -447,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -467,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -475,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -582,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -590,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -653,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -675,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -695,6 +727,12 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Purchase Order Module</portal_type>
  <title>Purchase Orders</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
index 112e9c9a79..e7457ac15d 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
@@ -63,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -91,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -99,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -239,6 +263,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -251,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -271,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -292,24 +318,22 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add Zope Schedulers</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -340,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -400,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -447,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -467,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -475,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -582,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -590,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -653,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -675,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -695,6 +727,12 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Purchase Packing List Module</portal_type>
  <title>Purchase Packing Lists</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
index a6641fa21c..487b2d7614 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
@@ -37,9 +37,6 @@
   <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
@@ -61,12 +58,39 @@
   <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
   <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -175,6 +199,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
@@ -184,6 +211,9 @@
   <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
@@ -199,9 +229,6 @@
   <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-  </permission>
   <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
@@ -215,19 +242,19 @@
    <name>Add Z MySQL Database Connections</name>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailIn Clients</name>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailMessages</name>
+   <name>Add ZODB Mount Points</name>
   </permission>
   <permission type='list'>
-   <name>Add ZODB Mount Points</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='list'>
    <name>Add Zope Tutorials</name>
@@ -250,6 +277,12 @@
   <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
@@ -296,10 +329,7 @@
    <name>Change Versions</name>
   </permission>
   <permission type='list'>
-   <name>Change ZMailIn</name>
-  </permission>
-  <permission type='list'>
-   <name>Change ZMailMessages</name>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='list'>
    <name>Change bindings</name>
@@ -331,6 +361,9 @@
   <permission type='list'>
    <name>Copy or Move</name>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
@@ -346,12 +379,18 @@
   <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Edit Factories</name>
   </permission>
   <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='list'>
    <name>FTP access</name>
   </permission>
@@ -431,13 +470,13 @@
    <name>Modify portal content</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connection</name>
+   <name>Move CMFWiki Page</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connections</name>
+   <name>Open/Close Database Connection</name>
   </permission>
   <permission type='list'>
-   <name>Post mail to ZMailIn</name>
+   <name>Open/Close Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Query Vocabulary</name>
@@ -484,6 +523,9 @@
   <permission type='list'>
    <name>Use Factories</name>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
@@ -493,9 +535,6 @@
   <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission type='list'>
-   <name>View ZMailMessage</name>
-  </permission>
   <permission type='list'>
    <name>View management screens</name>
   </permission>
@@ -508,6 +547,12 @@
   <permission type='list'>
    <name>WebDAV access</name>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Purchase Supply Module</portal_type>
  <title>Purchase Supplies</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
index 510f8f5637..0c9c9c63fe 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
@@ -63,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -91,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -99,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -239,6 +263,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -251,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -271,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -292,24 +318,22 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add Zope Schedulers</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -340,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -400,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -447,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -467,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -475,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -582,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -590,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -653,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -675,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -695,6 +727,12 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Purchase Trade Condition Module</portal_type>
  <title>Purchase Trade Conditions</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
index 3312b01527..6e1f824ba3 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
@@ -19,9 +19,6 @@
   <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission type='list'>
-   <name>AccessContentsInformation</name>
-  </permission>
   <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
@@ -40,9 +37,6 @@
   <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
@@ -64,12 +58,39 @@
   <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
   <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -179,7 +200,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='list'>
    <name>Add Python Scripts</name>
@@ -190,6 +211,9 @@
   <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
@@ -205,9 +229,6 @@
   <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-  </permission>
   <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
@@ -221,22 +242,19 @@
    <name>Add Z MySQL Database Connections</name>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailIn Clients</name>
-  </permission>
-  <permission type='list'>
-   <name>Add ZMailMessages</name>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
   <permission type='list'>
-   <name>Add ZSyncers</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='list'>
    <name>Add Zope Tutorials</name>
@@ -259,6 +277,12 @@
   <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
@@ -305,10 +329,7 @@
    <name>Change Versions</name>
   </permission>
   <permission type='list'>
-   <name>Change ZMailIn</name>
-  </permission>
-  <permission type='list'>
-   <name>Change ZMailMessages</name>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='list'>
    <name>Change bindings</name>
@@ -340,6 +361,9 @@
   <permission type='list'>
    <name>Copy or Move</name>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
@@ -355,12 +379,18 @@
   <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Edit Factories</name>
   </permission>
   <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='list'>
    <name>FTP access</name>
   </permission>
@@ -394,6 +424,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
@@ -412,6 +445,9 @@
   <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='list'>
    <name>Manage languages</name>
   </permission>
@@ -434,13 +470,13 @@
    <name>Modify portal content</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connection</name>
+   <name>Move CMFWiki Page</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connections</name>
+   <name>Open/Close Database Connection</name>
   </permission>
   <permission type='list'>
-   <name>Post mail to ZMailIn</name>
+   <name>Open/Close Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Query Vocabulary</name>
@@ -487,6 +523,9 @@
   <permission type='list'>
    <name>Use Factories</name>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
@@ -496,9 +535,6 @@
   <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission type='list'>
-   <name>View ZMailMessage</name>
-  </permission>
   <permission type='list'>
    <name>View management screens</name>
   </permission>
@@ -512,13 +548,10 @@
    <name>WebDAV access</name>
   </permission>
   <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
+   <name>ZopeScheduler: Manage scheduling task</name>
   </permission>
   <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <name>ZopeScheduler: Schedule tasks</name>
   </permission>
  </permission_list>
  <portal_type>Returned Sale Packing List Module</portal_type>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
index 5ffd5804ec..06f05276b9 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
@@ -40,10 +40,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>AccessContentsInformation</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -67,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -95,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -103,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -244,7 +264,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -258,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -278,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,26 +318,21 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZSyncers</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
@@ -350,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -410,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -457,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -477,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -485,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -533,6 +557,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -557,6 +584,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -586,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -594,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -657,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -679,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -700,13 +728,10 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
+   <name>ZopeScheduler: Manage scheduling task</name>
   </permission>
   <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <name>ZopeScheduler: Schedule tasks</name>
   </permission>
  </permission_list>
  <portal_type>Sale Order Module</portal_type>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
index 8bccb81fbf..ea21be91cf 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
@@ -40,10 +40,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>AccessContentsInformation</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -67,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -95,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -103,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -244,7 +264,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -258,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -278,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,26 +318,21 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZSyncers</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
@@ -350,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -410,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -457,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -477,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -485,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -533,6 +557,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -557,6 +584,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -586,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -594,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -657,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -679,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -700,13 +728,10 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
+   <name>ZopeScheduler: Manage scheduling task</name>
   </permission>
   <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <name>ZopeScheduler: Schedule tasks</name>
   </permission>
  </permission_list>
  <portal_type>Sale Packing List Module</portal_type>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
index 8d201cf38a..677c5cbc9d 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
@@ -19,9 +19,6 @@
   <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission type='list'>
-   <name>AccessContentsInformation</name>
-  </permission>
   <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
@@ -40,9 +37,6 @@
   <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
@@ -64,12 +58,39 @@
   <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
   <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -179,7 +200,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='list'>
    <name>Add Python Scripts</name>
@@ -190,6 +211,9 @@
   <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
@@ -205,9 +229,6 @@
   <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-  </permission>
   <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
@@ -221,22 +242,19 @@
    <name>Add Z MySQL Database Connections</name>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
   <permission type='list'>
-   <name>Add ZMailIn Clients</name>
-  </permission>
-  <permission type='list'>
-   <name>Add ZMailMessages</name>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
   <permission type='list'>
-   <name>Add ZSyncers</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='list'>
    <name>Add Zope Tutorials</name>
@@ -259,6 +277,12 @@
   <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
@@ -305,10 +329,7 @@
    <name>Change Versions</name>
   </permission>
   <permission type='list'>
-   <name>Change ZMailIn</name>
-  </permission>
-  <permission type='list'>
-   <name>Change ZMailMessages</name>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='list'>
    <name>Change bindings</name>
@@ -340,6 +361,9 @@
   <permission type='list'>
    <name>Copy or Move</name>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
@@ -355,12 +379,18 @@
   <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='list'>
    <name>Edit Factories</name>
   </permission>
   <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='list'>
    <name>FTP access</name>
   </permission>
@@ -394,6 +424,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
@@ -412,6 +445,9 @@
   <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='list'>
    <name>Manage languages</name>
   </permission>
@@ -434,13 +470,13 @@
    <name>Modify portal content</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connection</name>
+   <name>Move CMFWiki Page</name>
   </permission>
   <permission type='list'>
-   <name>Open/Close Database Connections</name>
+   <name>Open/Close Database Connection</name>
   </permission>
   <permission type='list'>
-   <name>Post mail to ZMailIn</name>
+   <name>Open/Close Database Connections</name>
   </permission>
   <permission type='list'>
    <name>Query Vocabulary</name>
@@ -487,6 +523,9 @@
   <permission type='list'>
    <name>Use Factories</name>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
@@ -496,9 +535,6 @@
   <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission type='list'>
-   <name>View ZMailMessage</name>
-  </permission>
   <permission type='list'>
    <name>View management screens</name>
   </permission>
@@ -512,13 +548,10 @@
    <name>WebDAV access</name>
   </permission>
   <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
+   <name>ZopeScheduler: Manage scheduling task</name>
   </permission>
   <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <name>ZopeScheduler: Schedule tasks</name>
   </permission>
  </permission_list>
  <portal_type>Sale Supply Module</portal_type>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
index 1e513138e4..3e451f48dc 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
@@ -40,10 +40,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>AccessContentsInformation</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -67,9 +63,6 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -95,6 +88,9 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFCalendar Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -103,6 +99,30 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add CMFWiki Comment</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
   <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
@@ -244,7 +264,7 @@
    <name>Add Plugin Registrys</name>
   </permission>
   <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+   <name>Add PortalTransforms Tools</name>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -258,6 +278,9 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -278,10 +301,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,26 +318,21 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>Add ZSyncers</name>
+   <name>Add Zope Schedulers</name>
   </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
@@ -350,6 +364,12 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -410,13 +430,8 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
   </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
@@ -457,6 +472,9 @@
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -477,6 +495,9 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -485,6 +506,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -533,6 +557,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -557,6 +584,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -586,6 +616,9 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -594,10 +627,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -657,6 +686,9 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -679,10 +711,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
@@ -700,13 +728,10 @@
    <role>Manager</role>
   </permission>
   <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
+   <name>ZopeScheduler: Manage scheduling task</name>
   </permission>
   <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <name>ZopeScheduler: Schedule tasks</name>
   </permission>
  </permission_list>
  <portal_type>Sale Trade Condition Module</portal_type>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml
index 645dc51f05..6ad10fbcc2 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/resource/packing.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/resource/packing.xml
index 9e798d30bd..e9a829665f 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_categories/resource/packing.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/resource/packing.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/invoice.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/invoice.xml
index ea0430cfcf..ee07832863 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/invoice.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/invoice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/order.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/order.xml
index f1f5322e6b..0725625edb 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/order.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/packing%20list.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/packing%20list.xml
index 6cdfe418af..0906c83ab5 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/packing%20list.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/trade_date/packing%20list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml b/bt5/erp5_trade/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
index 630a0e60b7..076520c97c 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml b/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
index 0c0c0de52d..c51d15fe00 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml
index 3c71943a5b..e5b6313216 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryRule</string>
-          <string>DeliveryRule</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryRule" module="Products.ERP5Type.Document.DeliveryRule"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -65,25 +62,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -91,13 +76,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
index 05c79ef140..18c1b2436f 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.CategoryDivergenceTester</string>
-          <string>CategoryDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
index 407698622e..ac84343e15 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.PropertyDivergenceTester</string>
-          <string>PropertyDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
index d523d42413..7827616b56 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml
index c77b3c42af..1f55e70112 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.OrderRule</string>
-          <string>OrderRule</string>
-        </tuple>
-        <none/>
+        <global name="OrderRule" module="Products.ERP5Type.Document.OrderRule"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -65,25 +62,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -91,13 +76,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
index c5985da468..4975cd9974 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.CategoryDivergenceTester</string>
-          <string>CategoryDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
index 407698622e..ac84343e15 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.PropertyDivergenceTester</string>
-          <string>PropertyDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
index afe78d6c2e..8d3e60c452 100644
--- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
+++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
index a23c05f944..b8b51d3211 100644
--- a/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
+++ b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -1,4 +1,7 @@
 <property_sheet_list>
+ <portal_type id="Inventory">
+  <item>DuplicateInventory</item>
+ </portal_type>
  <portal_type id="Sale Order">
   <item>PaymentCondition</item>
  </portal_type>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
index 131fd74c0e..49a1bec238 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
index 700f9783e6..57a1d550ab 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
index d9c248aa4d..564858f691 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml
index 49e81c430c..fada243585 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
index 94d0d7c182..42b80178c5 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml
index 2f09ea72d6..5f9bf4577d 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Cell.xml
index 490ca23ebc..5530867f12 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
index ee133569f0..9e3a51e06a 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
index ed0ad0f454..581a93a7a1 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
index cf04120040..483f5711f4 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml
index 021ba91a26..2ac502e2a1 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
index 35fd5a8771..6493bc117d 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
index ac6bf3c278..cb79b39f34 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
index f4ec9d0209..838f82785b 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -100,6 +97,10 @@
             <key> <string>init_script</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>permission</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
index 27d78a74cd..7c90476615 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml
index 6af09ae6ba..3ef8388bfc 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Cell.xml
index c43271e24f..b8683c4477 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
index b0ab6d1dea..98bd4d77c5 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
index 3232efd6b4..43ae7a4ca4 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
index bfc8e11b05..8d91cc2250 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml
index e74de77bef..210551da72 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
index bd07c33efc..af6dcdfdf5 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
index 9570f1d2a0..76d9d66f07 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
index 458b2fb8f5..a1ab9bfe32 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
index 863b023379..096760b1cb 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
index 08bbff8f2a..7b454f84fc 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
index e24766cc73..2f0e7945ee 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
index 5ac9a0a3a9..e5db1187ef 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
index 286cc1c803..b30366957e 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
index 422477115e..85c719bc4f 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell.xml
index fb384394eb..0a53fe276c 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line.xml
index b30b3a5a8f..5ba50c6c2a 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module.xml
index 6c7dfffed6..790f04df45 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List.xml
index 28370306bc..de6d07ba29 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Returned%20Sale%20Packing%20List.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Cell.xml
index 12ce79661a..2d943bbcc1 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
index 7ba9972933..85216a5a41 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
index 7deb92886d..1f8b1db1da 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
index fe07d0eae7..73f4b5f029 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml
index 5e19f8f845..d104d4f6e8 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
index d0e45e67a2..d953964cdf 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
index c76518a03b..169fd98f4b 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
index fddae2a5c3..2402b840bd 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
index 675f96627e..56f4933967 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
index 982fb62f0a..c178c6f00c 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
index b40d0010c8..04c2fc9aca 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
index 6b6507111d..42069aaee2 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
index d406290d87..2267655233 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
index a547f34fd6..eb239fd943 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
index f9b04781c0..2a6560064b 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
index 864fff1fc3..01f804a12a 100644
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade.xml
index 355f8f4b33..632aa806ab 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary.xml
index f3d7a792bc..787b8eef76 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/immobilisation_state.xml
index bfac629526..c881381791 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_activity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_activity.xml
index 24db28188c..fd71c953de 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_activity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_activity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_amortisation_method.xml
index 2084d5ea1f..35d7217e15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
index 4febe61ffb..9d9269c612 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_delivery_mode.xml
index 734a56ba9a..e8ffbe40ca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_description.xml
index c12351b4f9..ca8670dd5f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_administration_title.xml
index 4aff658fcb..6faf0adb62 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_decision_title.xml
index 7f217e3fbc..bd71879397 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_payment_title.xml
index 64c81cc167..f9dfea781d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
index 149a253b67..562969ef80 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_section_title.xml
index bd8d7a32fd..1d06eb30af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
index ec9d027670..1ff7361579 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_effective_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_effective_date.xml
index 17b4e3f254..2234781096 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_effective_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_effective_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_errand_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_errand_ratio.xml
index 29d6b3908a..643febdcd5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_errand_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_errand_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
index ca5bfa7fa7..fa0afac274 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_group.xml
index d3311f0237..f499426fdc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_group.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_incoterm.xml
index 23dee5d070..c64e3c6e8d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_order.xml
index 40c2ac5113..e890f75fff 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_order.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_origin.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_origin.xml
index 3d7248f37c..a2c29be290 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_origin.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_origin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price.xml
index 79e9038cf0..d7dd37fb55 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price_currency.xml
index 030e06ccaa..611a2004cd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
index bf573258ad..7e7ec63c2d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity_unit.xml
index 776d5ac5c6..3c569edfc4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_received_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_received_date.xml
index a221a911e6..de96061a97 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_received_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_received_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
index c7dae1e394..e7715af3d9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_segmentation.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_segmentation.xml
index 004544164e..deea96f02d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_segmentation.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_segmentation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_administration_title.xml
index 09a21825c5..82dd6161af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_destination_reference.xml
index 64b98db708..49852e2ae0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_destination_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_title.xml
index 11c502f445..383b7f8d2c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_payment_title.xml
index 6a8e52b367..ecb816af6b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_section_title.xml
index 7b29e61cb5..65ddc31fb1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_title.xml
index 46da6346e7..7163ad7f2f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date.xml
index 482debc80e..8dee3cceec 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_max.xml
index 7c847d8326..a5764c0fb4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_min.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_min.xml
index 7e217ce19f..af4a891620 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_min.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_start_date_range_min.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_stop_date.xml
index 0b887b6979..fd1f1e0a2c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/simulation_state.xml
index 2163b85814..353e399379 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/total_price.xml
index 11f8a98183..a09c04fe15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary.xml
index 018c654031..26fa960533 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/immobilisation_state.xml
index bfac629526..c881381791 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_activity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_activity.xml
index 24db28188c..fd71c953de 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_activity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_activity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_aggregate_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_aggregate_title_list.xml
index fb4de5a12e..3fb3566fcb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_aggregate_title_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_aggregate_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_amortisation_method.xml
index 2084d5ea1f..35d7217e15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
index 4febe61ffb..9d9269c612 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_delivery_mode.xml
index 734a56ba9a..e8ffbe40ca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
index c12351b4f9..ca8670dd5f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_administration_title.xml
index e2260b6337..4000560818 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_decision_title.xml
index 0f59c13edf..84c1547203 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_payment_title.xml
index 477be820da..802a38a12b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
index 149a253b67..562969ef80 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_section_title.xml
index bac1791b04..c68e0aa726 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
index ec9d027670..1ff7361579 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_effective_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_effective_date.xml
index 17b4e3f254..2234781096 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_effective_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_effective_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_errand_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_errand_ratio.xml
index 29d6b3908a..643febdcd5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_errand_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_errand_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
index ca5bfa7fa7..fa0afac274 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_group.xml
index d3311f0237..f499426fdc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_group.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_incoterm.xml
index 23dee5d070..c64e3c6e8d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_order.xml
index 40c2ac5113..e890f75fff 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_order.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_origin.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_origin.xml
index 3d7248f37c..a2c29be290 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_origin.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_origin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price.xml
index 79e9038cf0..d7dd37fb55 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price_currency.xml
index 030e06ccaa..611a2004cd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
index bf573258ad..7e7ec63c2d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity_unit.xml
index 776d5ac5c6..3c569edfc4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_received_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_received_date.xml
index a221a911e6..de96061a97 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_received_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_received_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
index c7dae1e394..e7715af3d9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_segmentation.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_segmentation.xml
index 004544164e..deea96f02d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_segmentation.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_segmentation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_administration_title.xml
index 69ce6ac3d6..1e70d6d8c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_destination_reference.xml
index 64b98db708..49852e2ae0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_destination_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_title.xml
index 29e636adce..182d48ac91 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_payment_title.xml
index 43dda33d5e..5ba883cdca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_section_title.xml
index 1fdae70ea3..0904027aa8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_title.xml
index 46da6346e7..7163ad7f2f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date.xml
index 482debc80e..8dee3cceec 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_max.xml
index 7c847d8326..a5764c0fb4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_min.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_min.xml
index 7e217ce19f..af4a891620 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_min.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_start_date_range_min.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_stop_date.xml
index 0b887b6979..fd1f1e0a2c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/simulation_state.xml
index 2163b85814..353e399379 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/total_price.xml
index 11f8a98183..a09c04fe15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
index d206733ec0..3cdab8f8fb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view.xml
index 460798e600..4826027bd2 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_viewQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_viewQuantity.xml
index 549868b074..dd41c4f8ab 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_viewQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_viewQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
index 0794654e30..f1fd0945d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -118,9 +115,11 @@ AND\t\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view.xml
index 3dd0978ded..6f75054d1d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
index 604afd1250..8a0156ca35 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -133,9 +130,11 @@ WHERE\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliverBuilder_selectConfirmedDeliveryList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliverBuilder_selectConfirmedDeliveryList.xml
index 3f43797c41..f02f562940 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliverBuilder_selectConfirmedDeliveryList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliverBuilder_selectConfirmedDeliveryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
index 980ab80f26..0a485e2463 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view.xml
index 949d452b2d..263759f422 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_aggregate_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_aggregate_title_list.xml
index b43c8d3a68..6b06566144 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_aggregate_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_amortisation_method.xml
index baf46b8766..9b6cba7df1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_description.xml
index 654c272720..6f15c46566 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_price.xml
index 148a019b63..076533f33a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity.xml
index bda2644e62..4b2e62f778 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity_unit.xml
index 776d5ac5c6..3c569edfc4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
index dec3104310..311c85aeb7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_variation_category_list.xml
index c1e53ecc50..1a3abc4817 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ParallelListField</string>
-          <string>ParallelListField</string>
-        </tuple>
-        <none/>
+        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
index e76dd373a6..0cc8bb67ce 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
index 6cdb1cc963..0d81ad28be 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml
index 318fc866c9..631fb3499a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_amortisation_method.xml
index baf46b8766..9b6cba7df1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_description.xml
index 20bb9ac368..f9c326f645 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_price.xml
index 367df548f2..7327b1f638 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity.xml
index ceed433ffb..86e5c6ee0a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_resource_title.xml
index a66089e260..e8c6363376 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_start_date.xml
index 764da6f957..e2fc8daa3e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_stop_date.xml
index 3ed5d447e0..a532f7b448 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_title.xml
index ca88bb3bd7..94f3c6f490 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_variation_category_list.xml
index 5ca599513b..0bac6d72d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ParallelListField</string>
-          <string>ParallelListField</string>
-        </tuple>
-        <none/>
+        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_price.xml
index 11f8a98183..a09c04fe15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_quantity.xml
index c480a6dee5..b3d710d67d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/total_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewIndustrialPhase.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewIndustrialPhase.xml
index 60586664db..fd778e9b7d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewIndustrialPhase.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewIndustrialPhase.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewPrice.xml
index 0f65a18003..d3122f054f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewQuantity.xml
index c0a6c34f04..1410a165ca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
index 7f00ea93aa..0aaf91fd3f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -119,9 +116,11 @@ AND\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
index 07ca6c5432..4c46c608a9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -120,9 +117,11 @@ AND\t\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
index b4760f0fde..f9bcfe6ddb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDivergenceMessageList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDivergenceMessageList.xml
index 2f202b7ead..887675064b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDivergenceMessageList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDivergenceMessageList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
index 42d4df5009..01d70a635e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
index 2bec739b10..f44020b465 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
index 8993e54596..7e67ea17f6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
index e8debe0dda..30252b2d82 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
index 8a0a472efd..3953785b03 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList.xml
index 6182c27cae..c2ab42a1ad 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList/listbox.xml
index 75dfd738ba..3dc1ed08d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewMergedDeliveryList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
index 1578d1aa37..612e429dad 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -155,9 +152,11 @@ ORDER BY <dtml-var order_by_expression>\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view.xml
index 521f522dfc..ddcbbec5f5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.xml
index 72ad019320..6bb925cf64 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view.xml
index 6805abc709..677059cf90 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/immobilisation_state.xml
index e253dc6380..d3f8c2c3f4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox.xml
index ea63ad725c..bd01c3376c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_description.xml
index 20bb9ac368..f9c326f645 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_section_title.xml
index 1cfff6b1aa..671cb5ed2e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_title.xml
index f15d81e4b0..6900aece4a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_price_currency.xml
index 06e52dcd02..2e77d0da5f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_section_title.xml
index 17c0fd7c0a..ff4f17a3c6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_title.xml
index 0dfa8251bf..e756968501 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_start_date.xml
index 764da6f957..e2fc8daa3e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_stop_date.xml
index 3ed5d447e0..a532f7b448 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_title.xml
index ca88bb3bd7..94f3c6f490 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/simulation_state.xml
index ca05c69f6e..ffcb0132d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/total_price.xml
index 11f8a98183..a09c04fe15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
index 9d750cd645..ba940a8f68 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_aggregate_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_aggregate_title_list.xml
index b43c8d3a68..6b06566144 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_aggregate_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_amortisation_method.xml
index baf46b8766..9b6cba7df1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
index 654c272720..6f15c46566 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_inventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_inventory.xml
index 4580ea2fc6..11b13a1620 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_inventory.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
index 148a019b63..076533f33a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_quantity_unit.xml
index 776d5ac5c6..3c569edfc4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
index dec3104310..311c85aeb7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_variation_category_list.xml
index c1e53ecc50..1a3abc4817 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ParallelListField</string>
-          <string>ParallelListField</string>
-        </tuple>
-        <none/>
+        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
index e81187ba26..ecd0e7e93f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
index 74fa65111a..b07f1d1cde 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_aggregate_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_aggregate_title_list.xml
index b43c8d3a68..6b06566144 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_aggregate_title_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_amortisation_method.xml
index baf46b8766..0a69a8a7eb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_method</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_description.xml
index 654c272720..6f15c46566 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
index 4580ea2fc6..11b13a1620 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
index 79e9038cf0..d7dd37fb55 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_quantity_unit.xml
index 776d5ac5c6..3c569edfc4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_resource_title.xml
index c7dae1e394..e7715af3d9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
index afa8fdbefc..2a4798174b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ParallelListField</string>
-          <string>ParallelListField</string>
-        </tuple>
-        <none/>
+        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory.xml
index 7ba0c22cbb..5ab267a520 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice.xml
index cb4a347952..12a102c7f6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
index 8a75858cbf..c2631dcdd6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -125,9 +122,11 @@ AND\t\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList.xml
index 66ff9b80f3..0f08beec99 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList/listbox.xml
index e53513b27c..dee5d19565 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryModule_viewInventoryList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -341,6 +338,18 @@
                           <string>description</string>
                           <string>Description</string>
                         </tuple>
+                        <tuple>
+                          <string>destination_title</string>
+                          <string>Warehouse</string>
+                        </tuple>
+                        <tuple>
+                          <string>start_date</string>
+                          <string>Inventory Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>Inventory State</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -406,7 +415,7 @@
                 </item>
                 <item>
                     <key> <string>lines</string> </key>
-                    <value> <int>10</int> </value>
+                    <value> <int>20</int> </value>
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
@@ -424,6 +433,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -461,7 +474,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>inventory_selection</string> </value>
+                    <value> <string>inventory_list_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -509,11 +522,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view.xml
index 354ec5321b..28fe82e6aa 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/immobilisation_state.xml
index e253dc6380..36128208cb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>immobilisation_state</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox.xml
index f6c8d7ad4f..f74eb963a5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -347,10 +344,6 @@
                     <key> <string>columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>id</string>
-                          <string>ID</string>
-                        </tuple>
                         <tuple>
                           <string>description</string>
                           <string>Description</string>
@@ -428,7 +421,7 @@
                 </item>
                 <item>
                     <key> <string>lines</string> </key>
-                    <value> <int>100</int> </value>
+                    <value> <int>20</int> </value>
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
@@ -446,6 +439,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -485,8 +482,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>id</string>
-                          <string>id</string>
+                          <string>resource_title</string>
+                          <string>resource_title</string>
                         </tuple>
                       </list>
                     </value>
@@ -526,18 +523,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <unicode>searchFolder</unicode> </value>
+            <value> <string>objectValues</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_description.xml
index ac9497435c..de7c1c6c8e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_section_title.xml
index 85010f1707..4c64095b14 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_title.xml
index a1e79a6750..7192f87c71 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -465,10 +462,6 @@
                           <string>Organisation</string>
                           <string>Organisation</string>
                         </tuple>
-                        <tuple>
-                          <string>Category</string>
-                          <string>Category</string>
-                        </tuple>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_start_date.xml
index 580ccfaa09..76ecc26087 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_title.xml
index 531e2bbab6..27ef502917 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/simulation_state.xml
index b95b91f810..df13d4cc83 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>simulation_state</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
index d8bbdbdb6c..53d2546fc0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
index f9c9342f30..531c252e53 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -162,9 +159,11 @@ WHERE\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
index 0778cb9990..43f1852189 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
index 639e6d8653..4b91cbc213 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -125,9 +122,11 @@ AND\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
index 8484719f07..b6cdd2b3bf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -164,9 +161,11 @@ ORDER BY <dtml-var order_by_expression>\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
index 4590eaa867..55c00f4a11 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml
index 21f96559fc..f0975e8703 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_amortisation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_amortisation_method.xml
index baf46b8766..9b6cba7df1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_amortisation_method.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_amortisation_method.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_description.xml
index 20bb9ac368..f9c326f645 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_price.xml
index 367df548f2..7327b1f638 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity.xml
index ceed433ffb..86e5c6ee0a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_resource_title.xml
index a66089e260..e8c6363376 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_title.xml
index ca88bb3bd7..94f3c6f490 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml
index 5ca599513b..0bac6d72d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ParallelListField</string>
-          <string>ParallelListField</string>
-        </tuple>
-        <none/>
+        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_price.xml
index 11f8a98183..a09c04fe15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_quantity.xml
index c480a6dee5..b3d710d67d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/total_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
index 051964b3f0..618272ab84 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
index 00db4f3f14..6f0d88c726 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog.xml
index 6b5e1529c9..5aed436f0a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewSolveActionsDialog.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewSolveActionsDialog.xml
index e13b12ef53..ce19e104f3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewSolveActionsDialog.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewSolveActionsDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
index 36ae978682..77fa3870dc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
index 457aab858f..fa4761dec0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
index 8904da059d..874f04bfdf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
index bcc3741feb..06ba0e5a97 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
index ad1d5a4325..5f243dd2ca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
index 0c290b0790..200a0439e9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.xml
index c06780ae07..faddfc3807 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
index 476687b586..1b61dd324a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -271,6 +268,7 @@ else:\n
                             <string>trade_condition</string>
                             <string>categories</string>
                             <string>None</string>
+                            <string>_inplacevar_</string>
                             <string>destination_decision_source_reference</string>
                             <string>filter_dict</string>
                             <string>to_copy</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
index 12bd2cd4c6..32258c89f7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml
index 84944872e2..ccd13be821 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_comment.xml
index 5cfd49c26e..af3935bb48 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_comment</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_delivery_mode.xml
index cff65bef57..fd154fa28c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_delivery_mode</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_administration_title.xml
index 7ea3b90074..7eab1c089d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_administration_title</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_section_title.xml
index 44609acfb2..9eaada694d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_section_title</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_incoterm.xml
index a69201cd31..085df022f3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_incoterm</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_order.xml
index d5a38e32c0..ac0bdd1faf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_order.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_order</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_origin.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_origin.xml
index b76c3b999f..e614fa4e82 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_origin.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_origin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_origin</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_price_currency.xml
index c7f2b931e4..0d2dc6b621 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_price_currency</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_administration_title.xml
index 04df91a948..807065dfcd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_administration_title</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_title.xml
index b32f54639a..f6289dbade 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_title</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_start_date.xml
index 972c95be88..a7b3f707a5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_start_date</string> </value>
@@ -88,6 +91,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>sub_form</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>tales</string> </key>
             <value>
@@ -203,4 +212,1654 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="BasicForm" module="Products.Formulator.Form"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fields</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>ampm</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>day</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hour</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>minute</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>month</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>year</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>Default</string>
+                <string>date</string>
+                <string>time</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key>                 <string>Default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>date</string> </key>
+                    <value>
+                      <list>
+<string>year</string>
+<string>month</string>
+<string>day</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>time</string> </key>
+                    <value>
+                      <list>
+<string>hour</string>
+<string>minute</string>
+<string>ampm</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>ISO-8859-1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Basic Form</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ampm</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>am/pm</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>day</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Day</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>hour</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Hour</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>minute</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Minute</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="7" aka="AAAAAAAAAAc=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>month</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Month</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="8" aka="AAAAAAAAAAg=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>year</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Year</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_stop_date.xml
index 3f3f889959..74265e2ca1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_stop_date</string> </value>
@@ -88,6 +91,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>sub_form</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>tales</string> </key>
             <value>
@@ -203,4 +212,1654 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="BasicForm" module="Products.Formulator.Form"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fields</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>ampm</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>day</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hour</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>minute</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>month</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>year</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>Default</string>
+                <string>date</string>
+                <string>time</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key>                 <string>Default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>date</string> </key>
+                    <value>
+                      <list>
+<string>year</string>
+<string>month</string>
+<string>day</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>time</string> </key>
+                    <value>
+                      <list>
+<string>hour</string>
+<string>minute</string>
+<string>ampm</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>ISO-8859-1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Basic Form</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ampm</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>am/pm</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>day</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Day</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>hour</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Hour</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>minute</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Minute</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="7" aka="AAAAAAAAAAc=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>month</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Month</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="8" aka="AAAAAAAAAAg=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>year</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Year</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_title.xml
index 1dedbbadf1..8667c9c96d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_trade_condition_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_trade_condition_title.xml
index 3b8ba74d3b..7de76f8d92 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_trade_condition_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_trade_condition_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/simulation_state.xml
index 589ae3f376..2e3e5b0758 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,6 +15,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>simulation_state</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.xml
index 4539ef08a6..fef316c206 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
index a9a93683f9..53dae576de 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml
index cd838793a1..49a0b6f5c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/immobilisation_state.xml
index e253dc6380..d3f8c2c3f4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox.xml
index 6b49e59525..a3bcaf697f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_state.xml
index 33ae128aae..dc8bfb9003 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_title.xml
index 444d992df0..e11053f773 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_causality_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_comment.xml
index 1a1d986a8d..2e6ed9f4b0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_delivery_mode.xml
index bf0e923a1d..fdaec76883 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_administration_title.xml
index 467885ba41..2cca0d5513 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_section_title.xml
index 1cfff6b1aa..671cb5ed2e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_incoterm.xml
index c1bb0e9dd1..7945637388 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_source_title.xml
index fdb1569dca..3b0226b8f7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_start_date.xml
index 764da6f957..e2fc8daa3e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_stop_date.xml
index 3ed5d447e0..a532f7b448 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_title.xml
index 14074b3f46..579713469e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/simulation_state.xml
index bcf25b2ec7..4e76323496 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_init.xml
index 3e6eac0ea4..e2237e1b5b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_init.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view.xml
index 5ea0375e9e..ac42c59e46 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_additional_price.xml
index 5d40423988..6ef821b8fe 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_base_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_base_price.xml
index 410c19c2d3..9b13f4e338 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_base_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_comment.xml
index 5cfd49c26e..257f3a688c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_discount_ratio.xml
index f016603563..81c898529e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml
index 53e17d8119..4542cb8a47 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml
index e1f9f29545..bbed93489e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_price_currency.xml
index c7f2b931e4..b59c468cb5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_quantity_unit.xml
index d125c0df8c..8a8804e29f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_surcharge_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_surcharge_ratio.xml
index 0ae45a5af8..193ef577b6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_surcharge_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_variable_additional_price.xml
index d5d5533b5d..86ff60c929 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_view/my_variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_viewBasePrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_viewBasePrice.xml
index 5fa282af8c..24408fbe91 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyLine_viewBasePrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyModule_viewPurchaseSupplyList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyModule_viewPurchaseSupplyList.xml
index 1fe84bf670..8336adb290 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyModule_viewPurchaseSupplyList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupplyModule_viewPurchaseSupplyList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view.xml
index 18ec0472a5..b0a3ffa6bb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_description.xml
index 43d1551add..13445c93da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_destination_title.xml
index 553a146e16..dad033cce6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_price_currency.xml
index c7f2b931e4..b59c468cb5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_administration_title.xml
index 04df91a948..94fbc791e1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_section_title.xml
index 6c1f71771a..1c63bd7504 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_title.xml
index 1dedbbadf1..66a0c830ed 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseSupply_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList.xml
index 83d65c289e..3cdb340ce7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
index d1f5eda4b9..907d9b7a84 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view.xml
index 5101dcd0fa..fc716b2b51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_activity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_activity.xml
index 2e7d0fd966..1873346c7d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_activity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_activity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_comment.xml
index 5cfd49c26e..257f3a688c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_delivery_mode.xml
index cff65bef57..3e81fa2040 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_description.xml
index 43d1551add..13445c93da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_administration_title.xml
index 7ea3b90074..dcd05b2d14 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_section_title.xml
index 44609acfb2..b0284d8caa 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_title.xml
index 553a146e16..dad033cce6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_effective_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_effective_date.xml
index 0216b7d745..c90b5257ee 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_effective_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_effective_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_expiration_date.xml
index 7114dbcd7b..abebeeccc1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_expiration_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_group.xml
index a1ec4456bf..66e2f5dfa9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_group.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_incoterm.xml
index a69201cd31..2537e6b61e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_price_currency.xml
index c7f2b931e4..b59c468cb5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_source_title.xml
index b32f54639a..ffc2ad48b7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_title.xml
index 1dedbbadf1..66a0c830ed 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile.xml
index 9b18701b11..b64fb21056 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_administration_title.xml
index 7ea3b90074..dcd05b2d14 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_decision_title.xml
index 16ea715cc8..9f32059cbb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_payment_title.xml
index c81d4ff4ee..154dc04af0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_project_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_project_title.xml
index 552f514d66..7052455008 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_project_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_project_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_section_title.xml
index 44609acfb2..b0284d8caa 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_title.xml
index 553a146e16..dad033cce6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_administration_title.xml
index 04df91a948..94fbc791e1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_decision_title.xml
index 02fbddb13e..b4bdd1c1aa 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_payment_title.xml
index 0270d3b4e2..ed4e793d02 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_project_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_project_title.xml
index 3b4f7d230d..2ae194c7cd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_project_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_project_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_section_title.xml
index 6c1f71771a..1c63bd7504 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_title.xml
index b32f54639a..ffc2ad48b7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewProfile/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultPurchaseSupplyLine.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultPurchaseSupplyLine.xml
index 404595305c..42581a8237 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultPurchaseSupplyLine.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultPurchaseSupplyLine.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
index ba118b0724..87548ecdd2 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultPurchaseSupplyLine.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultPurchaseSupplyLine.xml
index 767e6b4cf3..0cb88b66ff 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultPurchaseSupplyLine.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultPurchaseSupplyLine.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine.xml
index a586e16b14..1be8f4511d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLineReference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLineReference.xml
index cd220c3a4f..ffa99028f1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLineReference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLineReference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingListModule_viewReturnedSalePackingListList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingListModule_viewReturnedSalePackingListList.xml
index 295428efe1..3d9e74cc72 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingListModule_viewReturnedSalePackingListList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingListModule_viewReturnedSalePackingListList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view.xml
index 5120fe9cc6..f8a3fd9fe1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList.xml
index 51beebf25e..1f4199c55c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
index b430c83e4d..f5984d3148 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
index aafc68b475..26aefab177 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view.xml
index 09369dddf0..263da55e3d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
index 413e994293..fef087b1bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_delivery_mode.xml
index add48773f2..0ccc48dfa6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_decision_title.xml
index e8a47602da..754b8ef5df 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_reference.xml
index d30d185ae7..2b3c7be4a7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_title.xml
index a40a163719..bc808fdaf3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_errand_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_errand_ratio.xml
index 936626b5fa..30f494ccc2 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_errand_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_errand_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_group.xml
index 6ae720855b..1999758875 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_group.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_incoterm.xml
index 5c9cec05f7..86b0db37e0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_order.xml
index 7dbfe1c8ce..1788b1b987 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_order.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_origin.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_origin.xml
index 423c77acb3..34cdc28af7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_origin.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_origin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_received_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_received_date.xml
index b8eba0714c..d8585e3f6f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_received_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_received_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_segmentation.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_segmentation.xml
index 58f756ad31..70ff70bd79 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_segmentation.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_segmentation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_administration_title.xml
index 252cd11845..7e75d86a1b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_decision_title.xml
index f40b82622d..2401cb0100 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_section_title.xml
index 72153992c3..b8b8c827af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_start_date.xml
index 972c95be88..c759cea960 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_stop_date.xml
index 3f3f889959..7447e4755e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_title.xml
index 86fda42895..8bfc53e4c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_trade_condition_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_trade_condition_title.xml
index f1f8389935..4ddec9d52c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_trade_condition_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_trade_condition_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/simulation_state.xml
index d2c22f16d4..f91d37e0b8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList.xml
index 53dc1cffd8..0e637d52fd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
index 86aa67a2bf..5067f405bf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
index f0569921ab..dcbd951b22 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -259,6 +256,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
                             <string>new_container_id</string>
                             <string>int</string>
                             <string>container</string>
+                            <string>_inplacevar_</string>
                             <string>resource_url</string>
                             <string>line_variation_base_category_dict</string>
                             <string>line_variation_category_list</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInputForm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInputForm.xml
index 933216f3e9..64ab4f28d0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInputForm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInputForm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml
index 2b033e307a..9efd817f8d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/immobilisation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/immobilisation_state.xml
index c2c35991cb..52d3a614cf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/immobilisation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/immobilisation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox.xml
index c5b73c1cf1..f871930df9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_state.xml
index 33ae128aae..dc8bfb9003 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_title.xml
index 98e4263a3c..364bf7c450 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_causality_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_comment.xml
index 7a9a00b4ff..f99e142a91 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_container_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_container_state.xml
index b0ae3bf980..ec4e2c0ba6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_container_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_container_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_delivery_mode.xml
index 1efb377a86..5b0904bb35 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_section_title.xml
index 8ad5ad6761..c6a6eb5ed6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_title.xml
index 007cd60be2..c08d286421 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_incoterm.xml
index 5345160033..a660e66b6f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_administration_title.xml
index 0ab56da9bb..2ec7d11116 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_section_title.xml
index 17c0fd7c0a..ff4f17a3c6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_title.xml
index 0dfa8251bf..e756968501 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_start_date.xml
index 764da6f957..e2fc8daa3e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_stop_date.xml
index 3ed5d447e0..a532f7b448 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_title.xml
index ca88bb3bd7..94f3c6f490 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/simulation_state.xml
index ca05c69f6e..ffcb0132d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList.xml
index e6b9d68cb7..29f0a8153c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_state.xml
index 33ae128aae..dc8bfb9003 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_title.xml
index 8da9cc2603..a91c4cbb52 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_causality_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_comment.xml
index 413e994293..fef087b1bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_container_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_container_state.xml
index b0ae3bf980..ec4e2c0ba6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_container_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_container_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_delivery_mode.xml
index add48773f2..0ccc48dfa6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_section_title.xml
index ab96660b23..6b9f776812 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_title.xml
index a40a163719..bc808fdaf3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_incoterm.xml
index 5c9cec05f7..86b0db37e0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_administration_title.xml
index 252cd11845..7e75d86a1b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_section_title.xml
index 72153992c3..b8b8c827af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_title.xml
index 401230e76b..d5715d1124 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_start_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_start_date.xml
index 972c95be88..c759cea960 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_start_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_stop_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_stop_date.xml
index 3f3f889959..7447e4755e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_stop_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_title.xml
index 86fda42895..8bfc53e4c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/simulation_state.xml
index d2c22f16d4..f91d37e0b8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/simulation_state.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewContainerList/simulation_state.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_init.xml
index 89fc56e116..c22ad9c2fc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_init.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view.xml
index 6027c3446b..751f2fb671 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_additional_price.xml
index 755c331cf0..7fa6110acd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_base_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_base_price.xml
index acd93489fa..f05fdee275 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_base_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_comment.xml
index 413e994293..fef087b1bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_discount_ratio.xml
index 45a3522c8c..ff8a1965d6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_exclusive_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_exclusive_discount_ratio.xml
index 3da85c300e..c22e0b52bc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_exclusive_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_non_discountable_additional_price.xml
index e968ccc730..e0d2559efc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_non_discountable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_surcharge_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_surcharge_ratio.xml
index 7406d45189..66bb1805b6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_surcharge_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_variable_additional_price.xml
index a35e4eab03..4759fc31bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_view/my_variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice.xml
index 705f82f890..f00b2d3224 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml
index 755c331cf0..7fa6110acd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
index dafc36c0d9..f6b710bd25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml
index cefd2134ca..e4fd3f2b27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
index da2a1ac14d..2a950ee7da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice.xml
index 4ea026758b..9d9d3115b5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_base_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_base_price.xml
index acd93489fa..f05fdee275 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_base_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_base_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml
index dafc36c0d9..f6b710bd25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_resource_title.xml
index cefd2134ca..e4fd3f2b27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml
index da2a1ac14d..2a950ee7da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio.xml
index 1e4a6558e6..4cb6b85750 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml
index 45a3522c8c..ff8a1965d6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml
index dafc36c0d9..f6b710bd25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml
index cefd2134ca..e4fd3f2b27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
index da2a1ac14d..2a950ee7da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio.xml
index 6f4cc0ec1f..62f37f2e59 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
index 3da85c300e..c22e0b52bc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
index dafc36c0d9..f6b710bd25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
index cefd2134ca..e4fd3f2b27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
index da2a1ac14d..2a950ee7da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml
index 1f69a2ffa0..bf6aab686d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
index e968ccc730..e0d2559efc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio.xml
index 48e4e4ee61..9fdad935fe 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
index dafc36c0d9..f6b710bd25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml
index cefd2134ca..e4fd3f2b27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
index da2a1ac14d..2a950ee7da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
index 7406d45189..66bb1805b6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice.xml
index 58e3cda138..a642cccfee 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
index 34dbf4ec48..7ca92dddd1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
index a35e4eab03..4759fc31bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyModule_viewSaleSupplyList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyModule_viewSaleSupplyList.xml
index 21494b2638..4cc3d9d41d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyModule_viewSaleSupplyList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupplyModule_viewSaleSupplyList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view.xml
index 200c830d23..04fbfe5b95 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_description.xml
index ffd64e2f3f..f85f6a7f4b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_destination_title.xml
index a40a163719..bc808fdaf3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_administration_title.xml
index 252cd11845..7e75d86a1b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_section_title.xml
index 72153992c3..b8b8c827af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_title.xml
index 86fda42895..8bfc53e4c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleSupply_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList.xml
index 63167f7abd..b3de73c09a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
index a6199a460a..e322cfcd63 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view.xml
index 7e24841a20..09d4cd37a8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_activity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_activity.xml
index 53799d4908..e7ae90170d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_activity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_activity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_comment.xml
index 413e994293..fef087b1bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_delivery_mode.xml
index add48773f2..0ccc48dfa6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_delivery_mode.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_delivery_mode.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_description.xml
index ffd64e2f3f..f85f6a7f4b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_destination_title.xml
index a40a163719..bc808fdaf3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_effective_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_effective_date.xml
index 2d6297fdd0..60726cba5e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_effective_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_effective_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_expiration_date.xml
index 92113cc17d..b5eb7eb4bc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_expiration_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_group.xml
index 6ae720855b..1999758875 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_group.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_incoterm.xml
index 5c9cec05f7..86b0db37e0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_incoterm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_incoterm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_price_currency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_price_currency.xml
index 1daed09964..51e23f321a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_administration_title.xml
index 252cd11845..7e75d86a1b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_section_title.xml
index 72153992c3..b8b8c827af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_title.xml
index 86fda42895..8bfc53e4c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile.xml
index 2518cd17ce..c824b892f6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_administration_title.xml
index 448a43d11f..5b24e01492 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_decision_title.xml
index e8a47602da..754b8ef5df 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_payment_title.xml
index bcb039b682..17b7a5cede 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_section_title.xml
index ab96660b23..6b9f776812 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_title.xml
index a40a163719..bc808fdaf3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_administration_title.xml
index 252cd11845..7e75d86a1b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_administration_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_decision_title.xml
index f40b82622d..2401cb0100 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_payment_title.xml
index fc8a5d8ba8..3ab9309f16 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_payment_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_section_title.xml
index 72153992c3..b8b8c827af 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_title.xml
index 401230e76b..d5715d1124 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_viewProfile/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
index 763b381b28..0955497433 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
index d79d99a68c..79b25c20f3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
index 9debe45bce..01e80cbc36 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
index 30ebbf7665..1ed7252c57 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
index 4222e29c64..80097eb31e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view.xml
index 19ba4b7347..1b960de53e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_non_discountable_additional_price.xml
index 1bfe791ec7..3a0b658a5e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_non_discountable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_variable_additional_price.xml
index 16ad318dac..6a6e740f7e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_variable_additional_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice.xml
index d7e8d634c4..12d6b3f7dd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice.xml
index 4621b283ba..c4472caa7f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio.xml
index 952a7f1db1..fc490ded25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio.xml
index ce72f81e15..0c0835fe29 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewNonDiscountableAdditionalPrice.xml
index c30c20c25c..1ceecf3b15 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewNonDiscountableAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewReference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewReference.xml
index 9aad486f96..febe189a27 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewReference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewReference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio.xml
index 772f2f4a4a..3c789b7381 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewVariableAdditionalPrice.xml
index 2501ed3e2e..815bbe62c7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewVariableAdditionalPrice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyModule_viewSupplyList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyModule_viewSupplyList.xml
index 2781385998..33874cec30 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyModule_viewSupplyList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyModule_viewSupplyList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view.xml
index 03af295cfa..d31d340ebf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view/listbox.xml
index 65ac3d1a39..60798aff81 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Supply_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
index f873b8160e..50744e603c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -170,6 +167,7 @@ return due_date\n
                             <string>context</string>
                             <string>case</string>
                             <string>due_date</string>
+                            <string>_inplacevar_</string>
                             <string>peom</string>
                             <string>pt</string>
                             <string>pat</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
index c44185828f..0e2967ff65 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount.xml
index 99ae4f6570..2ce983eb32 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount/my_title.xml
index 86fda42895..8bfc53e4c9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewDiscount/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml
index 98c346fb62..0a20f05432 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml
index 876e8336f8..fc371694cd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml
index 2ceb71798f..48457f7d66 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml
index 343af99206..1301c41186 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml
index 7c3b0db884..3919551ca7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml
index befe49f9b5..b524dde3c1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
index f5c8216e2c..a18ed2642d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow.xml
index 55876a1f23..5df7c21b74 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
index 7d8c51003b..879a78b540 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml
index 7861a05cbb..23b7e4dc50 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
index 20807cc386..b8dc5175cb 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml
index 9eb2b48449..f75935cb1e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_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 87f1ab98b3..d4cb9ccff2 100644
--- 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
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
index bf7c23b62f..5c0d6745e1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
index 1a053b2d1a..85b20b0f37 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
index 74e460d335..230c786762 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
index 7eb769c118..38e4594ee4 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
index db67387d4e..733d9ce458 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow.xml
index 08334c52c4..7debbb328d 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml
index 49bcec6789..dda12824cd 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/portal_type.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/portal_type.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
index 2a2ec40808..2d127a06ab 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
index 2f2c8347b6..66683dde04 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -24,6 +21,12 @@
               <dictionary/>
             </value>
         </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</string> </value>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts/validateConsistency.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts/validateConsistency.xml
new file mode 100644
index 0000000000..408b34620d
--- /dev/null
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts/validateConsistency.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+from Products.ERP5Type.Message import Message\n
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+\n
+inventory = state_change[\'object\']\n
+\n
+# Make sure the start_date is defined\n
+start_date = inventory.getStartDate()\n
+if start_date is None:\n
+  text = "Sorry, you must define the inventory date"\n
+  message = Message(domain=\'ui\', message=text)\n
+  raise ValidationFailed, message\n
+\n
+# Make sure the node is defined\n
+node = inventory.getDestination()\n
+if node is None:\n
+  text = "Sorry, you must define the inventory warehouse"\n
+  message = Message(domain=\'ui\', message=text)\n
+  raise ValidationFailed, message\n
+\n
+\n
+# use of the constraint\n
+error_list = inventory.checkConsistency()\n
+if len(error_list) > 0:\n
+  raise ValidationFailed, (error_list[0].getTranslatedMessage(),)\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>state_change</string>
+                            <string>kw</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
+                            <string>Products.DCWorkflow.DCWorkflow</string>
+                            <string>ValidationFailed</string>
+                            <string>_getitem_</string>
+                            <string>inventory</string>
+                            <string>_getattr_</string>
+                            <string>start_date</string>
+                            <string>None</string>
+                            <string>text</string>
+                            <string>message</string>
+                            <string>node</string>
+                            <string>error_list</string>
+                            <string>len</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>validateConsistency</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
index d6c2d2d922..cd2db0fb0c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/deleted.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/deleted.xml
new file mode 100644
index 0000000000..6a1e1ce0ff
--- /dev/null
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/deleted.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>deleted</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Deleted</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Add portal content</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
index bee0e195fc..7ec204a0a5 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/draft.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/draft.xml
index 8f363c4648..f77c189ea7 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/draft.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -34,6 +31,8 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
+                <string>delete</string>
+                <string>delete_action</string>
                 <string>deliver</string>
                 <string>deliver_action</string>
               </tuple>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
index 3763e3df95..61f19d835a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete.xml
new file mode 100644
index 0000000000..80cd6128ec
--- /dev/null
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delete</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>deleted</string> </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete_action.xml
new file mode 100644
index 0000000000..0ccb72e7b9
--- /dev/null
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/delete_action.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>delete</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delete_action</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver.xml
index 3eeba3f51f..8f03c1ab44 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver_action.xml
index 03b361adf1..d2ad1f5b86 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions/deliver_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>validateConsistency</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -84,6 +78,7 @@
             <value>
               <tuple>
                 <string>Assignee</string>
+                <string>Manager</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
index 07046d72fe..7d9ea0fae8 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
index 4daf3ce5b8..032f581c9e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
index c2df6979e5..1927985d24 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
index 1c6966bea4..9a211a035c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
index 61c9a2d189..aace5d205e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
index 91a2bf48c2..568ac69469 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
index 053c0e2d67..c0c7fcf08a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow.xml
index 5eab3a2553..e2e2e31264 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
index 16503346d4..8f0a5fa3c5 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
index 82e4761f9a..bd65e5b205 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
index 29cbfb56aa..0454a571ee 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
index b7f324f53e..5061c252b8 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml
index 33d38943dc..2ff0c20d0e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml
index 9931cd046a..39a8113abc 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/confirmed.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/confirmed.xml
index 8de2970b81..ec463ce95c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/confirmed.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml
index 661a6973a0..7ac8c664fe 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml
index e03518b485..95da7414a3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml
index 06e1019f51..e038a8697f 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/auto_plan.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/auto_plan.xml
index 89bfa7360e..e514fe2d89 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/auto_plan.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/auto_plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel.xml
index c58fd34c48..04c6363a38 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel_action.xml
index 8a8647a10e..d809b204f8 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm.xml
index b2170fb93d..34b22186b8 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm_action.xml
index 8a09d55cd2..f41274f3f7 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/informDeliveryList.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/informDeliveryList.xml
index 977193c4f8..ff09fee8dd 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/informDeliveryList.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/informDeliveryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order.xml
index 528a797898..31ef15f168 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order_action.xml
index 95ed754367..e1771e8abb 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/order_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan.xml
index fd2a0b2c44..c9c1e670bd 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan_action.xml
index 9b8026d079..fd54d8e35a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/transitions/plan_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/error_message.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/error_message.xml
index 1913df119e..ea1ffb9595 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/error_message.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/portal_type.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/portal_type.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/start_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/start_date.xml
index 44577058a4..c19f7c7a15 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/start_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/stop_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/stop_date.xml
index b6d159025a..784b28d79c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/stop_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_purchase.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_purchase.xml
index 9e02a753aa..c6630107cc 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_purchase.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_purchase.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_sale.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_sale.xml
index 501c934cb3..4e1618a618 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_sale.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/draft_sale.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_purchase.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_purchase.xml
index 1366157fa5..06b9afafce 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_purchase.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_purchase.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_sale.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_sale.xml
index 229ff5c01e..df8f1a92b1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_sale.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/ordered_sale.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_purchase.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_purchase.xml
index 0e5bd3c4a1..14dca1b106 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_purchase.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_purchase.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_sale.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_sale.xml
index 8248377102..276444c224 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_sale.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/planned_sale.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow.xml
index a6dd1c0786..86545d2e0d 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
index 4f442833da..faad450e4e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
index d8424f96cc..058ae06399 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
index 4f7f1e7fd0..21de20dee1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
index 0b90790a35..df61ad0a20 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
index b879e4703e..a8f7924194 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/building.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/building.xml
index ca35fe88d6..fd9d6b607d 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/building.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/calculating.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/calculating.xml
index 2c8c208d16..94cc50ea25 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/calculating.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/calculating.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/diverged.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/diverged.xml
index b9bf4eeaab..4cd74ec2ca 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/diverged.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/diverged.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/draft.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/draft.xml
index 5a7fd7ac60..22218ae4c4 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/draft.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solved.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solved.xml
index f6f41350af..b9d45c49ca 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solved.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solved.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solving.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solving.xml
index df1264240f..1dc04270aa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solving.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/states/solving.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision.xml
index b2edb445a0..05442c969a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision_action.xml
index 4922534d70..e0eab6603e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/accept_decision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision.xml
index 79b1a1a22d..6fbefcf27a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision_action.xml
index 7e0fdb227b..88d0b2d5a4 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/adopt_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/converge.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/converge.xml
index 389c4d21c1..5fe67437fc 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/converge.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/converge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/diverge.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/diverge.xml
index 12a504b498..48816ec9c6 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/diverge.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/diverge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/edit.xml
index 2acf968ce6..e6dcb74edf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/edit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision.xml
index d4738e9429..9468b87330 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision_action.xml
index 39466caa9f..44d0c31245 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/split_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/start_building.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/start_building.xml
index 7638b58a62..373fc045b2 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/start_building.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/transitions/start_building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/portal_type.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/portal_type.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/start_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/start_date.xml
index 44577058a4..c19f7c7a15 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/start_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/stop_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/stop_date.xml
index b6d159025a..784b28d79c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/stop_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow.xml
index b91b5ea6e3..1093c8e479 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
index 85f9363c08..10822dde8b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/missing.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/missing.xml
index 0cbc37202a..798f95a431 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/missing.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/missing.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/packed.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/packed.xml
index fb729872a0..0c5e508acc 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/packed.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/states/packed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/edit.xml
index fdf1c0ef63..0ec30f2369 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/edit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/miss.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/miss.xml
index a7db6f8b9e..e6586d2523 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/miss.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/miss.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/pack.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/pack.xml
index 5a7dde64ed..c97db87188 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/pack.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/pack.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity.xml
index 594b9e582b..69381fd101 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
index 86c4f76943..fa965f7886 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/portal_type.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/portal_type.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/start_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/start_date.xml
index 44577058a4..c19f7c7a15 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/start_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/stop_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/stop_date.xml
index b6d159025a..784b28d79c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/stop_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow.xml
index 762704f29e..5be1a4da12 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions.xml
index 7d8c51003b..879a78b540 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_delete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_delete.xml
index bdbe2e2b06..ea58c48eef 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_delete.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_delete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
index fccce78646..a8bc814803 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
index 9e2c6f5d7c..3c16fe153a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
index 7dd9477ced..b27bb6604b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
index 1361947684..3e249e2560 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
index 32e917e824..378d96a7ba 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
index e5988baaff..a65e417340 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
index 52f035e944..0b16dcfcb3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
index d2f0fa0da7..2e0aa4bfad 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
index d13f3ca812..1c638f46ff 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/variables.xml
index db67387d4e..733d9ce458 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow.xml
index d7cc9912d1..565001815d 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
index ed264d9ff8..29622d0861 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
index 87625e34b7..fffd4e4f08 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/cancelled.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/cancelled.xml
index 85fcd059a7..c6cc8e339e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/cancelled.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml
index 564d44064e..ff6b471aa2 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml
index 49bcec6789..dda12824cd 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/draft.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/draft.xml
index a1a5dde416..42b0c0a3e0 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/draft.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml
index 28454a158c..a0fadcab96 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml
index 18d6fc5061..da972a1866 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml
index 5e0735d888..f6102e2025 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel.xml
index 28b6c83c1c..e1ca97937e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel_action.xml
index 8a8647a10e..d809b204f8 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm.xml
index 00cef70bbe..5811de9fb5 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm_action.xml
index e80720f168..2447833809 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver.xml
index 95acd80816..478db2d15b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml
index 0ec54d2fc9..0ebd728bed 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready.xml
index 44adfbb21e..0f6eaf76d3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
index be41fa163a..0bcfe9a17b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start.xml
index f2c391b129..6297b91f14 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start_action.xml
index a678fea810..5cd77c4b33 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/start_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop.xml
index bfeb37c774..c86214409f 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
index db374dbff9..dad1448eed 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/comment.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/comment.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/history.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/history.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/portal_type.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/portal_type.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/start_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/start_date.xml
index 44577058a4..c19f7c7a15 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/start_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/stop_date.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/stop_date.xml
index b6d159025a..784b28d79c 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/stop_date.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/time.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/time.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow.xml
index c8e089cdd7..384b153603 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions.xml
index 7d8c51003b..879a78b540 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeAdditionalPriceRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeAdditionalPriceRange.xml
index ebad481e0e..1e2bc665e9 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeAdditionalPriceRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeAdditionalPriceRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeBasePriceRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeBasePriceRange.xml
index ead05aafff..a6d0bfea61 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeBasePriceRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeBasePriceRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeDiscountRatioRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeDiscountRatioRange.xml
index 94482db5dd..151d554b0e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeDiscountRatioRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeDiscountRatioRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeExclusiveDiscountRatioRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeExclusiveDiscountRatioRange.xml
index 8a249794c4..778c4c6bf3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeExclusiveDiscountRatioRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeExclusiveDiscountRatioRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeNonDiscountableAdditionalPriceRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeNonDiscountableAdditionalPriceRange.xml
index 0f878d26c5..1fb17eae0f 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeNonDiscountableAdditionalPriceRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeNonDiscountableAdditionalPriceRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeSurchargeRatio.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeSurchargeRatio.xml
index 0199cb6a90..49aa89014e 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeSurchargeRatio.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeSurchargeRatio.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeVariableAdditionalPriceRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeVariableAdditionalPriceRange.xml
index 21cac5b0cf..5700318bc3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeVariableAdditionalPriceRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/interactions/SupplyLine_changeVariableAdditionalPriceRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
index 2a5da29937..3a6a0aa73b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
index 002640dd19..e0d8f07dcd 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
index 2dddbb21b9..ce59e3b282 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
index 4eb39fe83e..4dda10afe5 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
index 568c4788e0..a2a8a69fcc 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
index acd3b7c5cd..26952e5854 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalNonDiscountableAdditionalPriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalNonDiscountableAdditionalPriceCellRange.xml
index 8561de9d64..5d5dc32441 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalNonDiscountableAdditionalPriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalNonDiscountableAdditionalPriceCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
index bf2c8bc018..cbd11c28a3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalVariableAdditionalPriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalVariableAdditionalPriceCellRange.xml
index 3628febf8b..37ad6c5dd1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalVariableAdditionalPriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalVariableAdditionalPriceCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
index 7f9f4b908d..76ece75bce 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/variables.xml
index db67387d4e..733d9ce458 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow.xml
index f5ee434c2a..1dbfebbd0b 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions.xml
index 7d8c51003b..879a78b540 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions/setVariationCategoryList.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions/setVariationCategoryList.xml
index d6e9b48089..de9b6f86f0 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions/setVariationCategoryList.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/interactions/setVariationCategoryList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
index c9c55a04d7..dbef203627 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/variables.xml
index db67387d4e..733d9ce458 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 4b6f9c39e5..2fb681e3f9 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-64
\ No newline at end of file
+71
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_constraint_id_list b/bt5/erp5_trade/bt/template_constraint_id_list
index e69de29bb2..eacd6b6681 100644
--- a/bt5/erp5_trade/bt/template_constraint_id_list
+++ b/bt5/erp5_trade/bt/template_constraint_id_list
@@ -0,0 +1 @@
+DuplicateInventory
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_portal_type_property_sheet_list b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list
index aeb11ef341..9e46a388c0 100644
--- a/bt5/erp5_trade/bt/template_portal_type_property_sheet_list
+++ b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list
@@ -1,3 +1,4 @@
+Inventory | DuplicateInventory
 Sale Order | PaymentCondition
 Sale Trade Condition | Comment
 Sale Trade Condition | PaymentCondition
-- 
2.30.9