From 1e1646ffc15e4cec1b7caa3766dc8ebcd6842cdf Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Thu, 26 Aug 2010 17:56:36 +0000
Subject: [PATCH] Reorganize new/old simulation-related objects in BT to have
 proper dependencies

- split erp5_legacy into erp5_simulation_legacy (for generic objects) and
  erp5_{trade,accounting,invoicing}_simulation_legacy
- reverse dependency of erp5_simulation (which may not even need erp5_base)
- move obsolete portal type definitions (including some from erp5_base) to
  appropriate BT
- update BT list of unit tests

A unit test testing Trade now needs:
- new simulation: erp5_base, erp5_pdm, erp5_simulation, erp5_trade,
  erp5_simulation_test (in this order)
- legacy: erp5_base, erp5_pdm, erp5_simulation, erp5_simulation_legacy,
  erp5_trade, erp5_trade_legacy (in this order)

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38036 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../allowed_content_types.xml                 |  35 +-
 .../workflow_chain_type.xml                   |   8 -
 bt5/erp5_accounting/bt/dependency_list        |   3 +-
 .../bt/template_action_path_list              |   2 -
 bt5/erp5_accounting/bt/template_path_list     |   2 +-
 ...late_portal_type_allowed_content_type_list |  29 +-
 .../bt/template_portal_type_id_list           |   2 -
 .../template_portal_type_workflow_chain_list  |   4 -
 .../portal_types/Invoice%20Rule/view.xml      |   0
 .../portal_types/Payment%20Rule/view.xml      |   0
 ...nting_transaction_root_simulation_rule.xml |   0
 .../default_invoice_root_simulation_rule.xml  |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../portal_rules/default_invoice_rule.xml     |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../portal_rules/default_payment_rule.xml     |   0
 .../default_payment_simulation_rule.xml       |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../mirror_mapping.xml                        |   0
 .../allowed_content_types.xml                 |  31 +
 .../portal_types/Invoice%20Rule.xml           |   0
 .../portal_types/Payment%20Rule.xml           |   0
 .../workflow_chain_type.xml                   |  10 +
 .../erp5_accounting_simulation_legacy.xml     |  50 +
 .../InvoiceRule_asPredicate.xml               |   0
 .../PaymentRule_asPredicate.xml               |   0
 .../bt/copyright_list                         |   0
 .../bt/dependency_list                        |   2 +
 .../bt/license                                |   0
 .../bt/revision}                              |   0
 .../bt/template_action_path_list              |   2 +
 .../bt/template_format_version                |   1 +
 .../bt/template_path_list                     |  10 +
 ...late_portal_type_allowed_content_type_list |  17 +
 .../bt/template_portal_type_id_list           |   2 +
 .../template_portal_type_workflow_chain_list  |   4 +
 .../bt/template_skin_id_list                  |   1 +
 ...template_update_business_template_workflow |   0
 .../bt/template_update_tool                   |   0
 .../bt/title                                  |   1 +
 .../bt/version                                |   0
 .../portal_types/Delivery%20Builder.xml       |   4 +-
 .../workflow_chain_type.xml                   |  12 -
 bt5/erp5_base/bt/template_action_path_list    |   3 -
 bt5/erp5_base/bt/template_portal_type_id_list |   3 -
 .../template_portal_type_workflow_chain_list  |   3 -
 .../allowed_content_types.xml                 |  47 +-
 .../hidden_content_type_list.xml              |   3 -
 .../workflow_chain_type.xml                   |  12 -
 .../bt/template_action_path_list              |   4 -
 ...late_portal_type_allowed_content_type_list |  41 +-
 ...plate_portal_type_hidden_content_type_list |   3 +-
 .../bt/template_portal_type_id_list           |   3 -
 .../template_portal_type_workflow_chain_list  |   7 -
 .../divergence.xml                            |   0
 .../Invoice%20Transaction%20Rule/view.xml     |   0
 .../portal_types/Invoicing%20Rule/view.xml    |   0
 .../Trade%20Model%20Rule/view.xml             |   0
 .../payment_transaction_builder.xml           |   0
 .../category_movement_group_on_cell.xml       |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 ...assignement_movement_group_on_delivery.xml |   0
 .../mirror_movement_group_on_delivery.xml     |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../purchase_invoice_builder.xml              |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 ...assignement_movement_group_on_delivery.xml |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../purchase_invoice_transaction_builder.xml  |   0
 .../category_movement_group_on_cell.xml       |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 ...nvoice_transaction_trade_model_builder.xml |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../sale_invoice_builder.xml                  |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 ...assignement_movement_group_on_delivery.xml |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../sale_invoice_transaction_builder.xml      |   0
 .../category_movement_group_on_cell.xml       |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 ...nvoice_transaction_trade_model_builder.xml |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../causality_movement_group_on_delivery.xml  |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../default_invoice_simulation_rule.xml       |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../default_invoice_transaction_rule.xml      |   0
 ...lt_invoice_transaction_simulation_rule.xml |   0
 .../portal_rules/default_invoicing_rule.xml   |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../portal_rules/default_trade_model_rule.xml |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../default_trade_model_simulation_rule.xml   |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../allowed_content_types.xml                 |  39 +
 .../hidden_content_type_list.xml              |   5 +
 .../Invoice%20Transaction%20Rule.xml          |   0
 .../portal_types/Invoicing%20Rule.xml         |   0
 .../portal_types/Trade%20Model%20Rule.xml     |   0
 .../workflow_chain_type.xml                   |  14 +
 .../erp5_invoicing_simulation_legacy.xml      |  50 +
 .../InvoiceTransactionRule_asCellRange.xml    |   0
 .../InvoiceTransactionRule_asPredicate.xml    |   0
 ...nsactionRule_destinationRegionHasNoVat.xml |   0
 ...ransactionRule_destinationRegionHasVat.xml |   0
 .../InvoiceTransactionRule_view.xml           |   0
 .../InvoiceTransactionRule_view/listbox.xml   |   0
 ...box_membership_criterion_category_list.xml |   0
 .../InvoiceTransactionRule_view/matrixbox.xml |   0
 .../matrixbox_title.xml                       |   0
 .../my_reference.xml                          |   0
 .../my_start_date_range_max.xml               |   0
 .../my_start_date_range_min.xml               |   0
 .../my_test_method_id.xml                     |   0
 .../InvoiceTransactionRule_view/my_title.xml  |   0
 .../my_translated_validation_state_title.xml  |   0
 .../my_version.xml                            |   0
 .../InvoicingRule_asPredicate.xml             |   0
 ...ionMovement_testInvoiceTransactionRule.xml |   0
 ...t_testInvoiceTransactionSimulationRule.xml |   0
 .../SimulationMovement_testInvoicingRule.xml  |   0
 .../SimulationMovement_testTradeModelRule.xml |   0
 .../bt/copyright_list                         |   1 +
 .../bt/dependency_list                        |   2 +
 .../bt/license                                |   1 +
 .../bt/revision                               |   1 +
 .../bt/template_action_path_list              |   4 +
 .../bt/template_format_version                |   1 +
 .../bt/template_path_list                     |  26 +
 ...late_portal_type_allowed_content_type_list |  23 +
 ...plate_portal_type_hidden_content_type_list |   1 +
 .../bt/template_portal_type_id_list           |   3 +
 .../template_portal_type_workflow_chain_list  |   7 +
 .../bt/template_skin_id_list                  |   1 +
 ...template_update_business_template_workflow |   1 +
 .../bt/template_update_tool                   |   1 +
 bt5/erp5_invoicing_simulation_legacy/bt/title |   1 +
 .../bt/version                                |   1 +
 .../allowed_content_types.xml                 |  12 -
 bt5/erp5_legacy/bt/categories_list            |   0
 bt5/erp5_legacy/bt/change_log                 |   2 -
 bt5/erp5_legacy/bt/comment                    |   0
 bt5/erp5_legacy/bt/dependency_list            |   0
 bt5/erp5_legacy/bt/description                |   1 -
 bt5/erp5_legacy/bt/maintainer_list            |   0
 bt5/erp5_legacy/bt/provision_list             |   0
 bt5/erp5_legacy/bt/revision                   |   1 -
 .../bt/template_base_category_list            |   0
 .../bt/template_catalog_datetime_key_list     |   0
 .../bt/template_catalog_full_text_key_list    |   0
 .../bt/template_catalog_keyword_key_list      |   0
 .../bt/template_catalog_local_role_key_list   |   0
 .../bt/template_catalog_method_id_list        |   0
 .../bt/template_catalog_multivalue_key_list   |   0
 .../bt/template_catalog_related_key_list      |   0
 .../bt/template_catalog_request_key_list      |   0
 .../bt/template_catalog_result_key_list       |   0
 .../bt/template_catalog_result_table_list     |   0
 .../bt/template_catalog_role_key_list         |   0
 .../bt/template_catalog_scriptable_key_list   |   0
 .../bt/template_catalog_topic_key_list        |   0
 .../bt/template_constraint_id_list            |   0
 bt5/erp5_legacy/bt/template_extension_id_list |   0
 bt5/erp5_legacy/bt/template_local_role_list   |   0
 bt5/erp5_legacy/bt/template_local_roles_list  |   0
 .../bt/template_message_translation_list      |   0
 bt5/erp5_legacy/bt/template_module_id_list    |   0
 bt5/erp5_legacy/bt/template_path_list         |  56 --
 ...late_portal_type_allowed_content_type_list |   4 -
 .../template_portal_type_base_category_list   |   0
 ...plate_portal_type_hidden_content_type_list |   0
 .../bt/template_portal_type_id_list           |   2 -
 .../bt/template_portal_type_role_list         |   0
 .../bt/template_portal_type_roles_list        |   0
 .../template_portal_type_workflow_chain_list  |   0
 bt5/erp5_legacy/bt/template_preference_list   |   0
 bt5/erp5_legacy/bt/template_product_id_list   |   0
 .../bt/template_property_sheet_id_list        |   0
 .../template_registered_skin_selection_list   |   0
 bt5/erp5_legacy/bt/template_role_list         |   0
 .../bt/template_site_property_id_list         |   0
 bt5/erp5_legacy/bt/template_skin_id_list      |   1 -
 bt5/erp5_legacy/bt/template_test_id_list      |   0
 bt5/erp5_legacy/bt/template_tool_id_list      |   0
 bt5/erp5_legacy/bt/template_workflow_id_list  |   0
 bt5/erp5_legacy/bt/title                      |   1 -
 .../task_invoice_builder.xml                  |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../property_movement_group_on_line.xml       |   0
 .../title_movement_group_on_line.xml          |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../portal_deliveries/task_report_builder.xml |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 .../order_movement_group_on_delivery.xml      |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../requirement_movement_group_on_line.xml    |   0
 .../split_movement_group_on_line.xml          |   0
 .../title_movement_group_on_line.xml          |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../bt/copyright_list                         |   1 +
 .../bt/dependency_list                        |   2 +
 bt5/erp5_project_simulation_legacy/bt/license |   1 +
 .../bt/revision                               |   1 +
 .../bt/template_format_version                |   1 +
 .../bt/template_path_list                     |   4 +
 ...template_update_business_template_workflow |   1 +
 .../bt/template_update_tool                   |   1 +
 bt5/erp5_project_simulation_legacy/bt/title   |   1 +
 bt5/erp5_project_simulation_legacy/bt/version |   1 +
 .../allowed_content_types.xml                 |  64 --
 bt5/erp5_simulation/bt/change_log             |   2 -
 bt5/erp5_simulation/bt/dependency_list        |   3 +-
 ...late_portal_type_allowed_content_type_list |  50 +-
 .../Category%20Divergence%20Tester/view.xml   |   0
 .../Property%20Divergence%20Tester/view.xml   |   0
 .../Quantity%20Divergence%20Tester/view.xml   |   0
 .../DocumentTemplateItem/BusinessProcess.py   |   0
 .../DeliveryRootSimulationRule.py             |   0
 .../DeliverySimulationRule.py                 |   0
 .../InvoiceRootSimulationRule.py              |   0
 .../InvoiceSimulationRule.py                  |   0
 .../InvoiceTransactionSimulationRule.py       |   0
 .../OrderRootSimulationRule.py                |   0
 .../PaymentSimulationRule.py                  |   0
 .../RootAppliedRuleCausalityMovementGroup.py  |   0
 .../TradeModelSimulationRule.py               |   0
 .../DocumentTemplateItem/Transformation.py    |   0
 .../TransformedResource.py                    |   0
 .../Category%20Divergence%20Tester.xml        |   0
 .../Property%20Divergence%20Tester.xml        |   0
 .../Quantity%20Divergence%20Tester.xml        |   0
 .../workflow_chain_type.xml                   |  14 +
 .../portal_skins/erp5_simulation_legacy.xml}  |   2 +-
 .../PropertyDivergenceTester_view.xml         |   0
 .../my_description.xml                        |   0
 .../my_solver_list.xml                        |   0
 .../my_tested_property_list.xml               |   0
 .../my_title.xml                              |   0
 .../QuantityDivergenceTester_view.xml         |   0
 .../my_decimal_alignment_enabled.xml          |   0
 .../my_decimal_exponent.xml                   |   0
 .../my_decimal_rounding_option.xml            |   0
 .../my_description.xml                        |   0
 .../my_solver_list.xml                        |   0
 .../my_title.xml                              |   0
 bt5/erp5_simulation_legacy/bt/copyright_list  |   1 +
 bt5/erp5_simulation_legacy/bt/license         |   1 +
 bt5/erp5_simulation_legacy/bt/revision        |   1 +
 .../bt/template_action_path_list              |   3 +
 .../bt/template_document_id_list              |   0
 .../bt/template_format_version                |   1 +
 .../bt/template_portal_type_id_list           |   3 +
 .../template_portal_type_workflow_chain_list  |   3 +
 .../bt/template_skin_id_list                  |   1 +
 ...template_update_business_template_workflow |   1 +
 .../bt/template_update_tool                   |   1 +
 bt5/erp5_simulation_legacy/bt/title           |   1 +
 bt5/erp5_simulation_legacy/bt/version         |   1 +
 .../allowed_content_types.xml                 |  39 +-
 .../workflow_chain_type.xml                   |   8 -
 bt5/erp5_trade/bt/dependency_list             |   3 +-
 bt5/erp5_trade/bt/template_action_path_list   |   2 -
 ...late_portal_type_allowed_content_type_list |  35 +-
 .../bt/template_portal_type_id_list           |   2 -
 .../template_portal_type_workflow_chain_list  |   4 -
 .../portal_types/Business%20Path/profile.xml  |   0
 .../portal_types/Business%20Path/view.xml     |   0
 .../Business%20Path/view_advanced.xml         |   0
 .../portal_types/Business%20State/view.xml    |   0
 .../portal_types/Delivery%20Rule/view.xml     |   0
 .../portal_types/Order%20Rule/view.xml        |   0
 .../view_trade_model_line_list.xml            |   0
 .../view_trade_model_line_list.xml            |   0
 .../internal_packing_list_builder.xml         |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 ...lity_assignment_movement_group_on_line.xml |   0
 .../order_movement_group_on_delivery.xml      |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../purchase_packing_list_builder.xml         |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 ...lity_assignment_movement_group_on_line.xml |   0
 .../order_movement_group_on_delivery.xml      |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../sale_packing_list_builder.xml             |   0
 .../base_variant_movement_group_in_line.xml   |   0
 .../category_movement_group_on_delivery.xml   |   0
 .../category_movement_group_on_line.xml       |   0
 ...lity_assignment_movement_group_on_cell.xml |   0
 ...lity_assignment_movement_group_on_line.xml |   0
 .../order_movement_group_on_delivery.xml      |   0
 .../property_movement_group_on_delivery.xml   |   0
 .../property_movement_group_on_line.xml       |   0
 .../variant_movement_group_on_cell.xml        |   0
 .../default_delivery_root_simulation_rule.xml |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../portal_rules/default_delivery_rule.xml    |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../default_delivery_simulation_rule.xml      |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../default_order_root_simulation_rule.xml    |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../portal_rules/default_order_rule.xml       |   0
 .../default_category_tester.xml               |   0
 .../default_property_tester.xml               |   0
 .../default_quantity_tester.xml               |   0
 .../allowed_content_types.xml                 |  41 +
 .../property_sheet_list.xml                   |   0
 .../portal_types/Business%20Path.xml          |   0
 .../portal_types/Business%20State.xml         |   0
 .../portal_types/Delivery%20Rule.xml          |   0
 .../portal_types/Order%20Rule.xml             |   0
 .../workflow_chain_type.xml                   |  10 +
 .../erp5_trade_simulation_legacy.xml          |  50 +
 ...BusinessPath_getDefaultDestinationList.xml |   0
 .../BusinessPath_getDefaultSourceList.xml     |   0
 .../BusinessPath_view.xml                     |   0
 .../BusinessPath_view/my_delivery_mode.xml    |   0
 .../BusinessPath_view/my_description.xml      |   0
 .../BusinessPath_view/my_efficiency.xml       |   0
 .../BusinessPath_view/my_end_of.xml           |   0
 .../BusinessPath_view/my_incoterm.xml         |   0
 .../BusinessPath_view/my_int_index.xml        |   0
 .../BusinessPath_view/my_lead_time.xml        |   0
 .../BusinessPath_view/my_payment_mode.xml     |   0
 .../BusinessPath_view/my_quantity.xml         |   0
 .../BusinessPath_view/my_reference.xml        |   0
 .../BusinessPath_view/my_title.xml            |   0
 .../BusinessPath_view/my_wait_time.xml        |   0
 .../BusinessPath_viewAdvanced.xml             |   0
 .../my_completed_state_list.xml               |   0
 .../my_deliverable.xml                        |   0
 .../my_delivery_builder_list.xml              |   0
 .../my_destination_method_id.xml              |   0
 .../my_frozen_state_list.xml                  |   0
 .../my_order_builder_list.xml                 |   0
 .../my_predecessor_title.xml                  |   0
 .../my_source_method_id.xml                   |   0
 .../my_successor_title.xml                    |   0
 .../BusinessPath_viewAdvanced/my_title.xml    |   0
 .../my_trade_phase.xml                        |   0
 .../BusinessPath_viewProfile.xml              |   0
 .../my_destination_administration_title.xml   |   0
 .../my_destination_carrier_title.xml          |   0
 .../my_destination_decision_title.xml         |   0
 .../my_destination_payment.xml                |   0
 .../my_destination_project_title.xml          |   0
 .../my_destination_reference.xml              |   0
 .../my_destination_section_title.xml          |   0
 .../my_destination_title.xml                  |   0
 .../my_source_administration_title.xml        |   0
 .../my_source_carrier_title.xml               |   0
 .../my_source_decision_title.xml              |   0
 .../my_source_payment.xml                     |   0
 .../my_source_project_title.xml               |   0
 .../my_source_reference.xml                   |   0
 .../my_source_section_title.xml               |   0
 .../my_source_title.xml                       |   0
 .../BusinessState_view.xml                    |   0
 .../BusinessState_view/my_description.xml     |   0
 .../BusinessState_view/my_int_index.xml       |   0
 .../BusinessState_view/my_reference.xml       |   0
 .../BusinessState_view/my_title.xml           |   0
 .../DeliveryRule_asPredicate.xml              |   0
 .../Delivery_viewTradeModelLineList.xml       |   0
 .../listbox.xml                               |   0
 .../listbox_base_application_title_list.xml   |   0
 .../listbox_base_contribution_title_list.xml  |   0
 .../listbox_price.xml                         |   0
 .../listbox_reference.xml                     |   0
 .../my_title.xml                              |   0
 .../OrderRule_asPredicate.xml                 |   0
 .../bt/copyright_list                         |   1 +
 .../bt/dependency_list                        |   2 +
 bt5/erp5_trade_simulation_legacy/bt/license   |   1 +
 bt5/erp5_trade_simulation_legacy/bt/revision  |   1 +
 .../bt/template_action_path_list              |   2 +
 .../bt/template_format_version                |   1 +
 .../bt/template_path_list                     |  16 +
 ...late_portal_type_allowed_content_type_list |  21 +
 .../bt/template_portal_type_id_list           |   4 +
 .../template_portal_type_property_sheet_list  |   0
 .../template_portal_type_workflow_chain_list  |   4 +
 .../bt/template_skin_id_list                  |   1 +
 ...template_update_business_template_workflow |   1 +
 .../bt/template_update_tool                   |   1 +
 bt5/erp5_trade_simulation_legacy/bt/title     |   1 +
 bt5/erp5_trade_simulation_legacy/bt/version   |   1 +
 product/ERP5/tests/testAccounting.py          |   4 +-
 product/ERP5/tests/testAccountingRules.py     |   5 +-
 product/ERP5/tests/testAdvancedInvoicing.py   |   6 +-
 product/ERP5/tests/testBPMCore.py             |   6 +-
 .../ERP5/tests/testConversionInSimulation.py  |   3 +-
 product/ERP5/tests/testERP5Commerce.py        |   7 +-
 product/ERP5/tests/testERP5Simulation.py      |   4 -
 product/ERP5/tests/testImmobilisation.py      |   7 +-
 product/ERP5/tests/testInventory.py           |   4 +-
 product/ERP5/tests/testInventoryAPI.py        |   4 +-
 product/ERP5/tests/testInvoice.py             |   6 +-
 product/ERP5/tests/testOrder.py               |   6 +-
 product/ERP5/tests/testProductionOrder.py     |   4 +-
 product/ERP5/tests/testResource.py            |   4 +-
 product/ERP5/tests/testTask.py                |   4 +-
 product/ERP5/tests/testTaskReporting.py       |   4 +-
 product/ERP5/tests/testTransformation.py      |   5 +-
 product/ERP5Legacy/tests/testLegacyBPMCore.py |   8 +-
 .../tests/testLegacyBPMEvaluation.py          | 889 ------------------
 .../tests/testLegacyConversionInSimulation.py |  15 +-
 product/ERP5Legacy/tests/testLegacyInvoice.py |   5 +
 product/ERP5Legacy/tests/testLegacyOrder.py   |   9 +-
 .../tests/testLegacyProductionOrder.py        |   3 +-
 .../ERP5Legacy/tests/testLegacyRuleOrder.py   |   7 +-
 .../tests/testLegacySimulationInvoice.py      |   5 +
 .../tests/testLegacyTradeCondition.py         |   7 +-
 477 files changed, 700 insertions(+), 1374 deletions(-)
 rename bt5/{erp5_accounting => erp5_accounting_simulation_legacy}/ActionTemplateItem/portal_types/Invoice%20Rule/view.xml (100%)
 rename bt5/{erp5_accounting => erp5_accounting_simulation_legacy}/ActionTemplateItem/portal_types/Payment%20Rule/view.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_accounting_transaction_root_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule => erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule => erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule => erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule => erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/PathTemplateItem/portal_rules/default_payment_simulation_rule/mirror_mapping.xml (100%)
 create mode 100644 bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
 rename bt5/{erp5_accounting => erp5_accounting_simulation_legacy}/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml (100%)
 rename bt5/{erp5_accounting => erp5_accounting_simulation_legacy}/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml (100%)
 create mode 100644 bt5/erp5_accounting_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
 create mode 100644 bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceRule_asPredicate.xml (100%)
 rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/PaymentRule_asPredicate.xml (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/bt/copyright_list (100%)
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/dependency_list
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/bt/license (100%)
 rename bt5/{erp5_legacy/bt/template_format_version => erp5_accounting_simulation_legacy/bt/revision} (100%)
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_format_version
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_path_list
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_id_list
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_workflow_chain_list
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/template_skin_id_list
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/bt/template_update_business_template_workflow (100%)
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/bt/template_update_tool (100%)
 create mode 100644 bt5/erp5_accounting_simulation_legacy/bt/title
 rename bt5/{erp5_legacy => erp5_accounting_simulation_legacy}/bt/version (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/divergence.xml (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder}/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder}/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder}/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule}/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_invoicing_rule.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule}/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule => erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_invoicing_simulation_legacy}/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml (100%)
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml (100%)
 rename bt5/{erp5_invoicing => erp5_invoicing_simulation_legacy}/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml (100%)
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_asCellRange.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_asPredicate.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_destinationRegionHasNoVat.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_destinationRegionHasVat.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/listbox.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/matrixbox.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/matrixbox_title.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_reference.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_start_date_range_max.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_start_date_range_min.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_test_method_id.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_title.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_translated_validation_state_title.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoiceTransactionRule_view/my_version.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/InvoicingRule_asPredicate.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/SimulationMovement_testInvoiceTransactionRule.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/SimulationMovement_testInvoiceTransactionSimulationRule.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/SimulationMovement_testInvoicingRule.xml (100%)
 rename bt5/{erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing => erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy}/SimulationMovement_testTradeModelRule.xml (100%)
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/copyright_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/dependency_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/license
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/revision
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_format_version
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_path_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_hidden_content_type_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_id_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_workflow_chain_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_skin_id_list
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/template_update_tool
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/title
 create mode 100644 bt5/erp5_invoicing_simulation_legacy/bt/version
 delete mode 100644 bt5/erp5_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
 delete mode 100644 bt5/erp5_legacy/bt/categories_list
 delete mode 100644 bt5/erp5_legacy/bt/change_log
 delete mode 100644 bt5/erp5_legacy/bt/comment
 delete mode 100644 bt5/erp5_legacy/bt/dependency_list
 delete mode 100644 bt5/erp5_legacy/bt/description
 delete mode 100644 bt5/erp5_legacy/bt/maintainer_list
 delete mode 100644 bt5/erp5_legacy/bt/provision_list
 delete mode 100644 bt5/erp5_legacy/bt/revision
 delete mode 100644 bt5/erp5_legacy/bt/template_base_category_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_datetime_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_full_text_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_keyword_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_local_role_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_method_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_multivalue_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_related_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_request_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_result_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_result_table_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_role_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_scriptable_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_catalog_topic_key_list
 delete mode 100644 bt5/erp5_legacy/bt/template_constraint_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_extension_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_local_role_list
 delete mode 100644 bt5/erp5_legacy/bt/template_local_roles_list
 delete mode 100644 bt5/erp5_legacy/bt/template_message_translation_list
 delete mode 100644 bt5/erp5_legacy/bt/template_module_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_path_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_allowed_content_type_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_base_category_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_hidden_content_type_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_role_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_roles_list
 delete mode 100644 bt5/erp5_legacy/bt/template_portal_type_workflow_chain_list
 delete mode 100644 bt5/erp5_legacy/bt/template_preference_list
 delete mode 100644 bt5/erp5_legacy/bt/template_product_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_property_sheet_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_registered_skin_selection_list
 delete mode 100644 bt5/erp5_legacy/bt/template_role_list
 delete mode 100644 bt5/erp5_legacy/bt/template_site_property_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_skin_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_test_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_tool_id_list
 delete mode 100644 bt5/erp5_legacy/bt/template_workflow_id_list
 delete mode 100644 bt5/erp5_legacy/bt/title
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder => erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder => erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder}/order_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder => erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_project_simulation_legacy}/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml (100%)
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/copyright_list
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/dependency_list
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/license
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/revision
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/template_format_version
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/template_path_list
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/template_update_tool
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/title
 create mode 100644 bt5/erp5_project_simulation_legacy/bt/version
 rename bt5/{erp5_base => erp5_simulation_legacy}/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml (100%)
 rename bt5/{erp5_base => erp5_simulation_legacy}/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml (100%)
 rename bt5/{erp5_base => erp5_simulation_legacy}/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/BusinessProcess.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/DeliveryRootSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/DeliverySimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/InvoiceRootSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/InvoiceSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/InvoiceTransactionSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/OrderRootSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/PaymentSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/RootAppliedRuleCausalityMovementGroup.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/TradeModelSimulationRule.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/Transformation.py (100%)
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/DocumentTemplateItem/TransformedResource.py (100%)
 rename bt5/{erp5_base => erp5_simulation_legacy}/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml (100%)
 rename bt5/{erp5_base => erp5_simulation_legacy}/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml (100%)
 rename bt5/{erp5_base => erp5_simulation_legacy}/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml (100%)
 create mode 100644 bt5/erp5_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy.xml => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml} (95%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/PropertyDivergenceTester_view.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/PropertyDivergenceTester_view/my_description.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/PropertyDivergenceTester_view/my_solver_list.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/PropertyDivergenceTester_view/my_tested_property_list.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/PropertyDivergenceTester_view/my_title.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_decimal_exponent.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_decimal_rounding_option.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_description.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_solver_list.xml (100%)
 rename bt5/{erp5_base/SkinTemplateItem/portal_skins/erp5_base => erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy}/QuantityDivergenceTester_view/my_title.xml (100%)
 create mode 100644 bt5/erp5_simulation_legacy/bt/copyright_list
 create mode 100644 bt5/erp5_simulation_legacy/bt/license
 create mode 100644 bt5/erp5_simulation_legacy/bt/revision
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_action_path_list
 rename bt5/{erp5_legacy => erp5_simulation_legacy}/bt/template_document_id_list (100%)
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_format_version
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_portal_type_id_list
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_portal_type_workflow_chain_list
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_skin_id_list
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_simulation_legacy/bt/template_update_tool
 create mode 100644 bt5/erp5_simulation_legacy/bt/title
 create mode 100644 bt5/erp5_simulation_legacy/bt/version
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Business%20Path/profile.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Business%20Path/view.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Business%20State/view.xml (100%)
 rename bt5/{erp5_trade => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml (100%)
 rename bt5/{erp5_trade => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Order%20Rule/view.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder}/order_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder}/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder}/order_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder}/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder}/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder}/base_variant_movement_group_in_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder}/order_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder => erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder}/property_movement_group_on_delivery.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_delivery_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule}/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule}/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule => erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule}/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_rule.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml (100%)
 create mode 100644 bt5/erp5_trade_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PortalTypePropertySheetTemplateItem/property_sheet_list.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PortalTypeTemplateItem/portal_types/Business%20Path.xml (100%)
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/PortalTypeTemplateItem/portal_types/Business%20State.xml (100%)
 rename bt5/{erp5_trade => erp5_trade_simulation_legacy}/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml (100%)
 rename bt5/{erp5_trade => erp5_trade_simulation_legacy}/PortalTypeTemplateItem/portal_types/Order%20Rule.xml (100%)
 create mode 100644 bt5/erp5_trade_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
 create mode 100644 bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_getDefaultDestinationList.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_getDefaultSourceList.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_delivery_mode.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_description.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_efficiency.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_end_of.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_incoterm.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_int_index.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_lead_time.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_payment_mode.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_quantity.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_reference.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_view/my_wait_time.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_completed_state_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_deliverable.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_delivery_builder_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_destination_method_id.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_frozen_state_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_order_builder_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_predecessor_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_source_method_id.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_successor_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewAdvanced/my_trade_phase.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_administration_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_carrier_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_decision_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_payment.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_project_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_reference.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_section_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_destination_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_administration_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_carrier_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_decision_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_payment.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_project_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_reference.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_section_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessPath_viewProfile/my_source_title.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessState_view.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessState_view/my_description.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessState_view/my_int_index.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessState_view/my_reference.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/BusinessState_view/my_title.xml (100%)
 rename bt5/{erp5_trade/SkinTemplateItem/portal_skins/erp5_trade => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/DeliveryRule_asPredicate.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/listbox.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/listbox_price.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/listbox_reference.xml (100%)
 rename bt5/{erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/Delivery_viewTradeModelLineList/my_title.xml (100%)
 rename bt5/{erp5_trade/SkinTemplateItem/portal_skins/erp5_trade => erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy}/OrderRule_asPredicate.xml (100%)
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/copyright_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/dependency_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/license
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/revision
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/bt/template_action_path_list (64%)
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_format_version
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_path_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_portal_type_allowed_content_type_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_portal_type_id_list
 rename bt5/{erp5_legacy => erp5_trade_simulation_legacy}/bt/template_portal_type_property_sheet_list (100%)
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_portal_type_workflow_chain_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_skin_id_list
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/template_update_tool
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/title
 create mode 100644 bt5/erp5_trade_simulation_legacy/bt/version
 delete mode 100644 product/ERP5Legacy/tests/testLegacyBPMEvaluation.py

diff --git a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 2fd7322c64..2039eca511 100644
--- a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -21,11 +21,6 @@
   <item>Purchase Invoice Transaction</item>
   <item>Sale Invoice Transaction</item>
  </portal_type>
- <portal_type id="Accounting Transaction Root Simulation Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
  <portal_type id="Balance Transaction">
   <item>Balance Transaction Line</item>
  </portal_type>
@@ -33,31 +28,27 @@
   <item>Internal Invoice Transaction Line</item>
  </portal_type>
  <portal_type id="Invoice Root Simulation Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoice Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Organisation">
   <item>Accounting Period</item>
   <item>Cash Register</item>
  </portal_type>
- <portal_type id="Payment Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
  <portal_type id="Payment Simulation Rule">
   <item>Accounting Rule Cell</item>
-  <item>Category Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
   <item>Mapped Property</item>
+  <item>Net Converted Quantity Divergence Tester</item>
   <item>Predicate</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Payment Transaction">
   <item>Accounting Transaction Line</item>
@@ -78,8 +69,6 @@
  <portal_type id="Rule Tool">
   <item>Accounting Transaction Root Simulation Rule</item>
   <item>Invoice Root Simulation Rule</item>
-  <item>Invoice Rule</item>
-  <item>Payment Rule</item>
   <item>Payment Simulation Rule</item>
  </portal_type>
  <portal_type id="Sale Invoice Transaction">
diff --git a/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 99a4d2d1fa..341c014ce4 100644
--- a/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -35,14 +35,6 @@
   <type>Invoice Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Invoice Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
- <chain>
-  <type>Payment Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Payment Simulation Rule</type>
   <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
diff --git a/bt5/erp5_accounting/bt/dependency_list b/bt5/erp5_accounting/bt/dependency_list
index f947e6ab3e..0b67822b4a 100644
--- a/bt5/erp5_accounting/bt/dependency_list
+++ b/bt5/erp5_accounting/bt/dependency_list
@@ -1,2 +1,3 @@
 erp5_base >= 0.8.3
-erp5_core >= 1.0rc13
\ No newline at end of file
+erp5_core >= 1.0rc13
+erp5_simulation
\ No newline at end of file
diff --git a/bt5/erp5_accounting/bt/template_action_path_list b/bt5/erp5_accounting/bt/template_action_path_list
index cc1ecb2a78..a570845b4e 100644
--- a/bt5/erp5_accounting/bt/template_action_path_list
+++ b/bt5/erp5_accounting/bt/template_action_path_list
@@ -71,12 +71,10 @@ Internal Invoice Transaction | profile_view
 Internal Invoice Transaction | source_asset
 Internal Invoice Transaction | view
 Invoice Root Simulation Rule | view
-Invoice Rule | view
 Organisation | grouping_reference_fast_input
 Organisation | jump_active_accounting_pref
 Organisation | jump_to_accounting
 Organisation | transactions
-Payment Rule | view
 Payment Simulation Rule | divergence
 Payment Simulation Rule | view
 Payment Transaction | add_accounting_transaction_line
diff --git a/bt5/erp5_accounting/bt/template_path_list b/bt5/erp5_accounting/bt/template_path_list
index d67afa8783..930f8dd7f8 100644
--- a/bt5/erp5_accounting/bt/template_path_list
+++ b/bt5/erp5_accounting/bt/template_path_list
@@ -1,2 +1,2 @@
 portal_categories/account_type/**
-portal_categories/financial_section/*
+portal_categories/financial_section/*
\ No newline at end of file
diff --git a/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list
index 2f87336329..6ee4eeea48 100644
--- a/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list
@@ -7,31 +7,28 @@ Accounting Transaction Module | Balance Transaction
 Accounting Transaction Module | Payment Transaction
 Accounting Transaction Module | Purchase Invoice Transaction
 Accounting Transaction Module | Sale Invoice Transaction
-Accounting Transaction Root Simulation Rule | Category Divergence Tester
-Accounting Transaction Root Simulation Rule | Property Divergence Tester
-Accounting Transaction Root Simulation Rule | Quantity Divergence Tester
 Accounting Transaction | Accounting Transaction Line
 Accounting Transaction | File
 Accounting Transaction | Image
 Balance Transaction | Balance Transaction Line
 Internal Invoice Transaction | Internal Invoice Transaction Line
-Invoice Root Simulation Rule | Category Divergence Tester
-Invoice Root Simulation Rule | Property Divergence Tester
-Invoice Root Simulation Rule | Quantity Divergence Tester
-Invoice Rule | Category Divergence Tester
-Invoice Rule | Property Divergence Tester
-Invoice Rule | Quantity Divergence Tester
+Invoice Root Simulation Rule | Category Membership Divergence Tester
+Invoice Root Simulation Rule | DateTime Divergence Tester
+Invoice Root Simulation Rule | Float Divergence Tester
+Invoice Root Simulation Rule | Net Converted Quantity Divergence Tester
+Invoice Root Simulation Rule | String Divergence Tester
+Invoice Root Simulation Rule | Variation Divergence Tester
 Organisation | Accounting Period
 Organisation | Cash Register
-Payment Rule | Category Divergence Tester
-Payment Rule | Property Divergence Tester
-Payment Rule | Quantity Divergence Tester
 Payment Simulation Rule | Accounting Rule Cell
-Payment Simulation Rule | Category Divergence Tester
+Payment Simulation Rule | Category Membership Divergence Tester
+Payment Simulation Rule | DateTime Divergence Tester
+Payment Simulation Rule | Float Divergence Tester
 Payment Simulation Rule | Mapped Property
+Payment Simulation Rule | Net Converted Quantity Divergence Tester
 Payment Simulation Rule | Predicate
-Payment Simulation Rule | Property Divergence Tester
-Payment Simulation Rule | Quantity Divergence Tester
+Payment Simulation Rule | String Divergence Tester
+Payment Simulation Rule | Variation Divergence Tester
 Payment Transaction | Accounting Transaction Line
 Payment Transaction | File
 Payment Transaction | Image
@@ -44,8 +41,6 @@ Purchase Invoice Transaction | Image
 Purchase Invoice Transaction | Purchase Invoice Transaction Line
 Rule Tool | Accounting Transaction Root Simulation Rule
 Rule Tool | Invoice Root Simulation Rule
-Rule Tool | Invoice Rule
-Rule Tool | Payment Rule
 Rule Tool | Payment Simulation Rule
 Sale Invoice Transaction | File
 Sale Invoice Transaction | Image
diff --git a/bt5/erp5_accounting/bt/template_portal_type_id_list b/bt5/erp5_accounting/bt/template_portal_type_id_list
index e570e0f397..f16baca085 100644
--- a/bt5/erp5_accounting/bt/template_portal_type_id_list
+++ b/bt5/erp5_accounting/bt/template_portal_type_id_list
@@ -13,8 +13,6 @@ Cash Register
 Internal Invoice Transaction
 Internal Invoice Transaction Line
 Invoice Root Simulation Rule
-Invoice Rule
-Payment Rule
 Payment Simulation Rule
 Payment Transaction
 Purchase Invoice Transaction
diff --git a/bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list b/bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list
index 0d23df8d50..6768fe92f8 100644
--- a/bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list
@@ -19,10 +19,6 @@ Cash Register | validation_workflow
 Internal Invoice Transaction | accounting_workflow
 Invoice Root Simulation Rule | edit_workflow
 Invoice Root Simulation Rule | rule_validation_workflow
-Invoice Rule | edit_workflow
-Invoice Rule | rule_validation_workflow
-Payment Rule | edit_workflow
-Payment Rule | rule_validation_workflow
 Payment Simulation Rule | edit_workflow
 Payment Simulation Rule | rule_interaction_workflow
 Payment Simulation Rule | rule_validation_workflow
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Invoice%20Rule/view.xml b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_accounting/ActionTemplateItem/portal_types/Invoice%20Rule/view.xml
rename to bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Rule/view.xml
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Rule/view.xml b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Rule/view.xml
rename to bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Rule/view.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_accounting_transaction_root_simulation_rule.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_accounting_transaction_root_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_accounting_transaction_root_simulation_rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_accounting_transaction_root_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_category_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_category_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_rule.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_category_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_category_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_property_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_property_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_quantity_tester.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/mirror_mapping.xml b/bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/mirror_mapping.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/mirror_mapping.xml
rename to bt5/erp5_accounting_simulation_legacy/PathTemplateItem/portal_rules/default_payment_simulation_rule/mirror_mapping.xml
diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
new file mode 100644
index 0000000000..7df1278f7b
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -0,0 +1,31 @@
+<allowed_content_type_list>
+ <portal_type id="Accounting Transaction Root Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoice Root Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoice Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Payment Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Payment Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Rule Tool">
+  <item>Invoice Rule</item>
+  <item>Payment Rule</item>
+ </portal_type>
+</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
similarity index 100%
rename from bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Rule.xml
diff --git a/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
similarity index 100%
rename from bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
rename to bt5/erp5_accounting_simulation_legacy/PortalTypeTemplateItem/portal_types/Payment%20Rule.xml
diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
new file mode 100644
index 0000000000..10ffd8abdf
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -0,0 +1,10 @@
+<workflow_chain>
+ <chain>
+  <type>Invoice Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Payment Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
new file mode 100644
index 0000000000..652f1f4de4
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>30.0</float> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_accounting_simulation_legacy</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceRule_asPredicate.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceRule_asPredicate.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceRule_asPredicate.xml
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentRule_asPredicate.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/PaymentRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentRule_asPredicate.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/PaymentRule_asPredicate.xml
diff --git a/bt5/erp5_legacy/bt/copyright_list b/bt5/erp5_accounting_simulation_legacy/bt/copyright_list
similarity index 100%
rename from bt5/erp5_legacy/bt/copyright_list
rename to bt5/erp5_accounting_simulation_legacy/bt/copyright_list
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/dependency_list b/bt5/erp5_accounting_simulation_legacy/bt/dependency_list
new file mode 100644
index 0000000000..611c4489dc
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/dependency_list
@@ -0,0 +1,2 @@
+erp5_simulation_legacy
+erp5_accounting
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/license b/bt5/erp5_accounting_simulation_legacy/bt/license
similarity index 100%
rename from bt5/erp5_legacy/bt/license
rename to bt5/erp5_accounting_simulation_legacy/bt/license
diff --git a/bt5/erp5_legacy/bt/template_format_version b/bt5/erp5_accounting_simulation_legacy/bt/revision
similarity index 100%
rename from bt5/erp5_legacy/bt/template_format_version
rename to bt5/erp5_accounting_simulation_legacy/bt/revision
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list b/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
new file mode 100644
index 0000000000..ca958bd7d2
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
@@ -0,0 +1,2 @@
+Invoice Rule | view
+Payment Rule | view
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_format_version b/bt5/erp5_accounting_simulation_legacy/bt/template_format_version
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_path_list b/bt5/erp5_accounting_simulation_legacy/bt/template_path_list
new file mode 100644
index 0000000000..a9f1db1070
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_path_list
@@ -0,0 +1,10 @@
+portal_rules/default_accounting_transaction_root_simulation_rule
+portal_rules/default_accounting_transaction_root_simulation_rule/**
+portal_rules/default_invoice_root_simulation_rule
+portal_rules/default_invoice_root_simulation_rule/**
+portal_rules/default_invoice_rule
+portal_rules/default_invoice_rule/**
+portal_rules/default_payment_rule
+portal_rules/default_payment_rule/**
+portal_rules/default_payment_simulation_rule
+portal_rules/default_payment_simulation_rule/**
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
new file mode 100644
index 0000000000..2f14983a5d
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list
@@ -0,0 +1,17 @@
+Accounting Transaction Root Simulation Rule | Category Divergence Tester
+Accounting Transaction Root Simulation Rule | Property Divergence Tester
+Accounting Transaction Root Simulation Rule | Quantity Divergence Tester
+Invoice Root Simulation Rule | Category Divergence Tester
+Invoice Root Simulation Rule | Property Divergence Tester
+Invoice Root Simulation Rule | Quantity Divergence Tester
+Invoice Rule | Category Divergence Tester
+Invoice Rule | Property Divergence Tester
+Invoice Rule | Quantity Divergence Tester
+Payment Rule | Category Divergence Tester
+Payment Rule | Property Divergence Tester
+Payment Rule | Quantity Divergence Tester
+Payment Simulation Rule | Category Divergence Tester
+Payment Simulation Rule | Property Divergence Tester
+Payment Simulation Rule | Quantity Divergence Tester
+Rule Tool | Invoice Rule
+Rule Tool | Payment Rule
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_id_list b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_id_list
new file mode 100644
index 0000000000..ace9e4cf61
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_id_list
@@ -0,0 +1,2 @@
+Invoice Rule
+Payment Rule
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_workflow_chain_list b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000..276ca03998
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_workflow_chain_list
@@ -0,0 +1,4 @@
+Invoice Rule | edit_workflow
+Invoice Rule | rule_validation_workflow
+Payment Rule | edit_workflow
+Payment Rule | rule_validation_workflow
\ No newline at end of file
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_skin_id_list b/bt5/erp5_accounting_simulation_legacy/bt/template_skin_id_list
new file mode 100644
index 0000000000..71daef06ab
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_skin_id_list
@@ -0,0 +1 @@
+erp5_accounting_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_update_business_template_workflow b/bt5/erp5_accounting_simulation_legacy/bt/template_update_business_template_workflow
similarity index 100%
rename from bt5/erp5_legacy/bt/template_update_business_template_workflow
rename to bt5/erp5_accounting_simulation_legacy/bt/template_update_business_template_workflow
diff --git a/bt5/erp5_legacy/bt/template_update_tool b/bt5/erp5_accounting_simulation_legacy/bt/template_update_tool
similarity index 100%
rename from bt5/erp5_legacy/bt/template_update_tool
rename to bt5/erp5_accounting_simulation_legacy/bt/template_update_tool
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/title b/bt5/erp5_accounting_simulation_legacy/bt/title
new file mode 100644
index 0000000000..71daef06ab
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/title
@@ -0,0 +1 @@
+erp5_accounting_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/version b/bt5/erp5_accounting_simulation_legacy/bt/version
similarity index 100%
rename from bt5/erp5_legacy/bt/version
rename to bt5/erp5_accounting_simulation_legacy/bt/version
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
index ff0b07cdc1..c0c3d9b638 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
@@ -42,7 +42,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Delivery Builder objects allow to gather multiple Simulation Movements into\n
+            <value> <string>XXX Deprecated. It must be moved to erp5_simulation_legacy BT. 2 new portal types will replace it: Generated Delivery Builder and Simulated Delivery Builder, which will be in erp5_simulation BT.\n
+\n
+Delivery Builder objects allow to gather multiple Simulation Movements into\n
 a single Delivery. The initial quantity property of the Delivery Line is\n
 calculated by summing quantities of related Simulation Movements.\n
 \n
diff --git a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 8b73f105f7..f0e5c6d8a8 100644
--- a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -19,10 +19,6 @@
   <type>Career</type>
   <workflow>career_workflow</workflow>
  </chain>
- <chain>
-  <type>Category Divergence Tester</type>
-  <workflow>edit_workflow</workflow>
- </chain>
  <chain>
   <type>Chat Address</type>
   <workflow>edit_workflow</workflow>
@@ -71,14 +67,6 @@
   <type>Person</type>
   <workflow>edit_workflow, person_interaction_workflow, user_account_workflow, validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Property Divergence Tester</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Quantity Divergence Tester</type>
-  <workflow>edit_workflow</workflow>
- </chain>
  <chain>
   <type>Query</type>
   <workflow>edit_workflow, query_workflow</workflow>
diff --git a/bt5/erp5_base/bt/template_action_path_list b/bt5/erp5_base/bt/template_action_path_list
index 4eea905ead..c92f2d156f 100644
--- a/bt5/erp5_base/bt/template_action_path_list
+++ b/bt5/erp5_base/bt/template_action_path_list
@@ -10,7 +10,6 @@ Bank Account | view
 Base Variant Movement Group | view
 Career | change_function
 Career | view
-Category Divergence Tester | view
 Category Movement Group | view
 Causality Assignment Movement Group | view
 Causality Movement Group | view
@@ -69,9 +68,7 @@ Person | terminate_career
 Person | view
 Preference | base_preference
 Property Assignment Movement Group | view
-Property Divergence Tester | view
 Property Movement Group | view
-Quantity Divergence Tester | view
 Quantity Sign Movement Group | view
 Query Module | view
 Query | view
diff --git a/bt5/erp5_base/bt/template_portal_type_id_list b/bt5/erp5_base/bt/template_portal_type_id_list
index 3763a0f06d..ce36b29a92 100644
--- a/bt5/erp5_base/bt/template_portal_type_id_list
+++ b/bt5/erp5_base/bt/template_portal_type_id_list
@@ -5,7 +5,6 @@ Assignment
 Bank Account
 Base Variant Movement Group
 Career
-Category Divergence Tester
 Category Movement Group
 Causality Assignment Movement Group
 Causality Movement Group
@@ -41,9 +40,7 @@ Parent Explanation Movement Group
 Person
 Person Module
 Property Assignment Movement Group
-Property Divergence Tester
 Property Movement Group
-Quantity Divergence Tester
 Quantity Sign Movement Group
 Query
 Query Module
diff --git a/bt5/erp5_base/bt/template_portal_type_workflow_chain_list b/bt5/erp5_base/bt/template_portal_type_workflow_chain_list
index cc1592ba5b..c1da357745 100644
--- a/bt5/erp5_base/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_base/bt/template_portal_type_workflow_chain_list
@@ -5,7 +5,6 @@ Assignment | edit_workflow
 Bank Account | edit_workflow
 Bank Account | validation_workflow
 Career | career_workflow
-Category Divergence Tester | edit_workflow
 Chat Address | edit_workflow
 Credit Card | edit_workflow
 Credit Card | validation_workflow
@@ -34,8 +33,6 @@ Person | edit_workflow
 Person | person_interaction_workflow
 Person | user_account_workflow
 Person | validation_workflow
-Property Divergence Tester | edit_workflow
-Quantity Divergence Tester | edit_workflow
 Query | edit_workflow
 Query | query_workflow
 Role Definition | edit_workflow
diff --git a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 7205b71f6a..8ca1e89c6e 100644
--- a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -4,48 +4,37 @@
   <item>Invoice Line</item>
  </portal_type>
  <portal_type id="Invoice Simulation Rule">
-  <item>Category Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
   <item>Mapped Property</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoice Transaction Rule">
-  <item>Accounting Rule Cell</item>
-  <item>Category Divergence Tester</item>
-  <item>Predicate</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Invoice Transaction Simulation Rule">
   <item>Accounting Rule Cell</item>
-  <item>Category Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
   <item>Mapped Property</item>
+  <item>Net Converted Quantity Divergence Tester</item>
   <item>Predicate</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoicing Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Rule Tool">
   <item>Invoice Simulation Rule</item>
-  <item>Invoice Transaction Rule</item>
   <item>Invoice Transaction Simulation Rule</item>
-  <item>Invoicing Rule</item>
-  <item>Trade Model Rule</item>
   <item>Trade Model Simulation Rule</item>
  </portal_type>
- <portal_type id="Trade Model Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
  <portal_type id="Trade Model Simulation Rule">
-  <item>Category Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
   <item>Mapped Property</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
 </allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
index 28014f412c..05a0592c26 100644
--- a/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
+++ b/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
@@ -3,7 +3,4 @@
   <item>Invoice Cell</item>
   <item>Invoice Line</item>
  </portal_type>
- <portal_type id="Invoice Transaction Rule">
-  <item>Accounting Rule Cell</item>
- </portal_type>
 </hidden_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 816a99f9a9..a6f28992a9 100644
--- a/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -11,22 +11,10 @@
   <type>Invoice Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Invoice Transaction Rule</type>
-  <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Invoice Transaction Simulation Rule</type>
   <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Invoicing Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
- <chain>
-  <type>Trade Model Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Trade Model Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
diff --git a/bt5/erp5_invoicing/bt/template_action_path_list b/bt5/erp5_invoicing/bt/template_action_path_list
index 39233e950c..039b9484c2 100644
--- a/bt5/erp5_invoicing/bt/template_action_path_list
+++ b/bt5/erp5_invoicing/bt/template_action_path_list
@@ -3,10 +3,6 @@ Invoice Line | quantity
 Invoice Line | view
 Invoice Line | view_trade_model
 Invoice Simulation Rule | view
-Invoice Transaction Rule | divergence
-Invoice Transaction Rule | view
 Invoice Transaction Simulation Rule | divergence
 Invoice Transaction Simulation Rule | view
-Invoicing Rule | view
-Trade Model Rule | view
 Trade Model Simulation Rule | view
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
index 318f2543be..3d2e2ea725 100644
--- a/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
@@ -1,33 +1,28 @@
 Invoice Line | Invoice Cell
 Invoice Line | Invoice Line
-Invoice Simulation Rule | Category Divergence Tester
+Invoice Simulation Rule | Category Membership Divergence Tester
+Invoice Simulation Rule | DateTime Divergence Tester
+Invoice Simulation Rule | Float Divergence Tester
 Invoice Simulation Rule | Mapped Property
-Invoice Simulation Rule | Property Divergence Tester
-Invoice Simulation Rule | Quantity Divergence Tester
-Invoice Transaction Rule | Accounting Rule Cell
-Invoice Transaction Rule | Category Divergence Tester
-Invoice Transaction Rule | Predicate
-Invoice Transaction Rule | Property Divergence Tester
-Invoice Transaction Rule | Quantity Divergence Tester
+Invoice Simulation Rule | Net Converted Quantity Divergence Tester
+Invoice Simulation Rule | String Divergence Tester
+Invoice Simulation Rule | Variation Divergence Tester
 Invoice Transaction Simulation Rule | Accounting Rule Cell
-Invoice Transaction Simulation Rule | Category Divergence Tester
+Invoice Transaction Simulation Rule | Category Membership Divergence Tester
+Invoice Transaction Simulation Rule | DateTime Divergence Tester
+Invoice Transaction Simulation Rule | Float Divergence Tester
 Invoice Transaction Simulation Rule | Mapped Property
+Invoice Transaction Simulation Rule | Net Converted Quantity Divergence Tester
 Invoice Transaction Simulation Rule | Predicate
-Invoice Transaction Simulation Rule | Property Divergence Tester
-Invoice Transaction Simulation Rule | Quantity Divergence Tester
-Invoicing Rule | Category Divergence Tester
-Invoicing Rule | Property Divergence Tester
-Invoicing Rule | Quantity Divergence Tester
+Invoice Transaction Simulation Rule | String Divergence Tester
+Invoice Transaction Simulation Rule | Variation Divergence Tester
 Rule Tool | Invoice Simulation Rule
-Rule Tool | Invoice Transaction Rule
 Rule Tool | Invoice Transaction Simulation Rule
-Rule Tool | Invoicing Rule
-Rule Tool | Trade Model Rule
 Rule Tool | Trade Model Simulation Rule
-Trade Model Rule | Category Divergence Tester
-Trade Model Rule | Property Divergence Tester
-Trade Model Rule | Quantity Divergence Tester
-Trade Model Simulation Rule | Category Divergence Tester
+Trade Model Simulation Rule | Category Membership Divergence Tester
+Trade Model Simulation Rule | DateTime Divergence Tester
+Trade Model Simulation Rule | Float Divergence Tester
 Trade Model Simulation Rule | Mapped Property
-Trade Model Simulation Rule | Property Divergence Tester
-Trade Model Simulation Rule | Quantity Divergence Tester
\ No newline at end of file
+Trade Model Simulation Rule | Net Converted Quantity Divergence Tester
+Trade Model Simulation Rule | String Divergence Tester
+Trade Model Simulation Rule | Variation Divergence Tester
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_invoicing/bt/template_portal_type_hidden_content_type_list
index b9c72f20d3..3b0ec8db39 100644
--- a/bt5/erp5_invoicing/bt/template_portal_type_hidden_content_type_list
+++ b/bt5/erp5_invoicing/bt/template_portal_type_hidden_content_type_list
@@ -1,3 +1,2 @@
 Invoice Line | Invoice Cell
-Invoice Line | Invoice Line
-Invoice Transaction Rule | Accounting Rule Cell
\ No newline at end of file
+Invoice Line | Invoice Line
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/bt/template_portal_type_id_list b/bt5/erp5_invoicing/bt/template_portal_type_id_list
index e08c3913e4..75ab8cac20 100644
--- a/bt5/erp5_invoicing/bt/template_portal_type_id_list
+++ b/bt5/erp5_invoicing/bt/template_portal_type_id_list
@@ -1,8 +1,5 @@
 Invoice Cell
 Invoice Line
 Invoice Simulation Rule
-Invoice Transaction Rule
 Invoice Transaction Simulation Rule
-Invoicing Rule
-Trade Model Rule
 Trade Model Simulation Rule
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list b/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
index ebb69ba53b..3617445f04 100644
--- a/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
@@ -10,15 +10,8 @@ Invoice Line | pricing_interaction_workflow
 Invoice Line | trade_matrix_workflow
 Invoice Simulation Rule | edit_workflow
 Invoice Simulation Rule | rule_validation_workflow
-Invoice Transaction Rule | edit_workflow
-Invoice Transaction Rule | rule_interaction_workflow
-Invoice Transaction Rule | rule_validation_workflow
 Invoice Transaction Simulation Rule | edit_workflow
 Invoice Transaction Simulation Rule | rule_interaction_workflow
 Invoice Transaction Simulation Rule | rule_validation_workflow
-Invoicing Rule | edit_workflow
-Invoicing Rule | rule_validation_workflow
-Trade Model Rule | edit_workflow
-Trade Model Rule | rule_validation_workflow
 Trade Model Simulation Rule | edit_workflow
 Trade Model Simulation Rule | rule_validation_workflow
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/divergence.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/divergence.xml
similarity index 100%
rename from bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/divergence.xml
rename to bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/divergence.xml
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
rename to bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/view.xml
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
rename to bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoicing%20Rule/view.xml
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_invoicing/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
rename to bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Trade%20Model%20Rule/view.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/delivery_causality_assignement_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/mirror_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/delivery_causality_assignement_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_category_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_property_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml b/bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_invoicing_simulation_legacy/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
new file mode 100644
index 0000000000..911be8d628
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -0,0 +1,39 @@
+<allowed_content_type_list>
+ <portal_type id="Invoice Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoice Transaction Rule">
+  <item>Accounting Rule Cell</item>
+  <item>Category Divergence Tester</item>
+  <item>Predicate</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoice Transaction Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoicing Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Rule Tool">
+  <item>Invoice Transaction Rule</item>
+  <item>Invoicing Rule</item>
+  <item>Trade Model Rule</item>
+ </portal_type>
+ <portal_type id="Trade Model Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Trade Model Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
new file mode 100644
index 0000000000..fcf3c891a3
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
@@ -0,0 +1,5 @@
+<hidden_content_type_list>
+ <portal_type id="Invoice Transaction Rule">
+  <item>Accounting Rule Cell</item>
+ </portal_type>
+</hidden_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
similarity index 100%
rename from bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
diff --git a/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
similarity index 100%
rename from bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
diff --git a/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
similarity index 100%
rename from bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
rename to bt5/erp5_invoicing_simulation_legacy/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_invoicing_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
new file mode 100644
index 0000000000..cf7e808c58
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -0,0 +1,14 @@
+<workflow_chain>
+ <chain>
+  <type>Invoice Transaction Rule</type>
+  <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Invoicing Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Trade Model Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
new file mode 100644
index 0000000000..efdde6a35d
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>30.0</float> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_invoicing_simulation_legacy</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_asCellRange.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_asCellRange.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asCellRange.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_asPredicate.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_asPredicate.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_asPredicate.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_destinationRegionHasNoVat.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_destinationRegionHasNoVat.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasNoVat.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_destinationRegionHasVat.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_destinationRegionHasVat.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_destinationRegionHasVat.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/listbox.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/listbox.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/matrixbox.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/matrixbox.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/matrixbox_title.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/matrixbox_title.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_reference.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_reference.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_start_date_range_max.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_start_date_range_max.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_start_date_range_min.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_start_date_range_min.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_test_method_id.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_test_method_id.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_title.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_title.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_translated_validation_state_title.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_version.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransactionRule_view/my_version.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoicingRule_asPredicate.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoicingRule_asPredicate.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoicingRule_asPredicate.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionRule.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoiceTransactionSimulationRule.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testInvoicingRule.xml
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml b/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.xml
similarity index 100%
rename from bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
rename to bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/SimulationMovement_testTradeModelRule.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/copyright_list b/bt5/erp5_invoicing_simulation_legacy/bt/copyright_list
new file mode 100644
index 0000000000..fe948b9fb7
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2010 Nexedi SA
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/dependency_list b/bt5/erp5_invoicing_simulation_legacy/bt/dependency_list
new file mode 100644
index 0000000000..0e2dc147fd
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/dependency_list
@@ -0,0 +1,2 @@
+erp5_simulation_legacy
+erp5_invoicing
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/license b/bt5/erp5_invoicing_simulation_legacy/bt/license
new file mode 100644
index 0000000000..3a3e12bcad
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/revision b/bt5/erp5_invoicing_simulation_legacy/bt/revision
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
new file mode 100644
index 0000000000..18c814a81c
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
@@ -0,0 +1,4 @@
+Invoice Transaction Rule | divergence
+Invoice Transaction Rule | view
+Invoicing Rule | view
+Trade Model Rule | view
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_format_version b/bt5/erp5_invoicing_simulation_legacy/bt/template_format_version
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_path_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_path_list
new file mode 100644
index 0000000000..231c72c617
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_path_list
@@ -0,0 +1,26 @@
+portal_deliveries/payment_transaction_builder
+portal_deliveries/payment_transaction_builder/**
+portal_deliveries/purchase_invoice_builder
+portal_deliveries/purchase_invoice_builder/**
+portal_deliveries/purchase_invoice_transaction_builder
+portal_deliveries/purchase_invoice_transaction_builder/**
+portal_deliveries/purchase_invoice_transaction_trade_model_builder
+portal_deliveries/purchase_invoice_transaction_trade_model_builder/**
+portal_deliveries/sale_invoice_builder
+portal_deliveries/sale_invoice_builder/**
+portal_deliveries/sale_invoice_transaction_builder
+portal_deliveries/sale_invoice_transaction_builder/**
+portal_deliveries/sale_invoice_transaction_trade_model_builder
+portal_deliveries/sale_invoice_transaction_trade_model_builder/**
+portal_rules/default_invoice_simulation_rule
+portal_rules/default_invoice_simulation_rule/**
+portal_rules/default_invoice_transaction_rule
+portal_rules/default_invoice_transaction_rule/**
+portal_rules/default_invoice_transaction_simulation_rule
+portal_rules/default_invoice_transaction_simulation_rule/**
+portal_rules/default_invoicing_rule
+portal_rules/default_invoicing_rule/**
+portal_rules/default_trade_model_rule
+portal_rules/default_trade_model_rule/**
+portal_rules/default_trade_model_simulation_rule
+portal_rules/default_trade_model_simulation_rule/**
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
new file mode 100644
index 0000000000..5067f4abb9
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_allowed_content_type_list
@@ -0,0 +1,23 @@
+Invoice Simulation Rule | Category Divergence Tester
+Invoice Simulation Rule | Property Divergence Tester
+Invoice Simulation Rule | Quantity Divergence Tester
+Invoice Transaction Rule | Accounting Rule Cell
+Invoice Transaction Rule | Category Divergence Tester
+Invoice Transaction Rule | Predicate
+Invoice Transaction Rule | Property Divergence Tester
+Invoice Transaction Rule | Quantity Divergence Tester
+Invoice Transaction Simulation Rule | Category Divergence Tester
+Invoice Transaction Simulation Rule | Property Divergence Tester
+Invoice Transaction Simulation Rule | Quantity Divergence Tester
+Invoicing Rule | Category Divergence Tester
+Invoicing Rule | Property Divergence Tester
+Invoicing Rule | Quantity Divergence Tester
+Rule Tool | Invoice Transaction Rule
+Rule Tool | Invoicing Rule
+Rule Tool | Trade Model Rule
+Trade Model Rule | Category Divergence Tester
+Trade Model Rule | Property Divergence Tester
+Trade Model Rule | Quantity Divergence Tester
+Trade Model Simulation Rule | Category Divergence Tester
+Trade Model Simulation Rule | Property Divergence Tester
+Trade Model Simulation Rule | Quantity Divergence Tester
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_hidden_content_type_list
new file mode 100644
index 0000000000..d6b41f7c0d
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_hidden_content_type_list
@@ -0,0 +1 @@
+Invoice Transaction Rule | Accounting Rule Cell
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_id_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_id_list
new file mode 100644
index 0000000000..708de6e648
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_id_list
@@ -0,0 +1,3 @@
+Invoice Transaction Rule
+Invoicing Rule
+Trade Model Rule
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_workflow_chain_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000..6ca072584b
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_portal_type_workflow_chain_list
@@ -0,0 +1,7 @@
+Invoice Transaction Rule | edit_workflow
+Invoice Transaction Rule | rule_interaction_workflow
+Invoice Transaction Rule | rule_validation_workflow
+Invoicing Rule | edit_workflow
+Invoicing Rule | rule_validation_workflow
+Trade Model Rule | edit_workflow
+Trade Model Rule | rule_validation_workflow
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_skin_id_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_skin_id_list
new file mode 100644
index 0000000000..9d099c24ce
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_skin_id_list
@@ -0,0 +1 @@
+erp5_invoicing_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_update_business_template_workflow b/bt5/erp5_invoicing_simulation_legacy/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_update_tool b/bt5/erp5_invoicing_simulation_legacy/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/title b/bt5/erp5_invoicing_simulation_legacy/bt/title
new file mode 100644
index 0000000000..9d099c24ce
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/title
@@ -0,0 +1 @@
+erp5_invoicing_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/version b/bt5/erp5_invoicing_simulation_legacy/bt/version
new file mode 100644
index 0000000000..ceab6e11ec
--- /dev/null
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
diff --git a/bt5/erp5_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
deleted file mode 100644
index 0f1cf42721..0000000000
--- a/bt5/erp5_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<allowed_content_type_list>
- <portal_type id="Business Process">
-  <item>Business Path</item>
-  <item>Business State</item>
- </portal_type>
- <portal_type id="Purchase Order">
-  <item>Trade Model Line</item>
- </portal_type>
- <portal_type id="Sale Order">
-  <item>Trade Model Line</item>
- </portal_type>
-</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/categories_list b/bt5/erp5_legacy/bt/categories_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/change_log b/bt5/erp5_legacy/bt/change_log
deleted file mode 100644
index f7bf683432..0000000000
--- a/bt5/erp5_legacy/bt/change_log
+++ /dev/null
@@ -1,2 +0,0 @@
-2010-08-03 aurel
-- initial version with all former rules
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/comment b/bt5/erp5_legacy/bt/comment
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/dependency_list b/bt5/erp5_legacy/bt/dependency_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/description b/bt5/erp5_legacy/bt/description
deleted file mode 100644
index 56764291ac..0000000000
--- a/bt5/erp5_legacy/bt/description
+++ /dev/null
@@ -1 +0,0 @@
-Contains simulation related objects for backward compatibility purpose
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/maintainer_list b/bt5/erp5_legacy/bt/maintainer_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/provision_list b/bt5/erp5_legacy/bt/provision_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/revision b/bt5/erp5_legacy/bt/revision
deleted file mode 100644
index 62f9457511..0000000000
--- a/bt5/erp5_legacy/bt/revision
+++ /dev/null
@@ -1 +0,0 @@
-6
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_base_category_list b/bt5/erp5_legacy/bt/template_base_category_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_datetime_key_list b/bt5/erp5_legacy/bt/template_catalog_datetime_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_full_text_key_list b/bt5/erp5_legacy/bt/template_catalog_full_text_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_keyword_key_list b/bt5/erp5_legacy/bt/template_catalog_keyword_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_local_role_key_list b/bt5/erp5_legacy/bt/template_catalog_local_role_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_method_id_list b/bt5/erp5_legacy/bt/template_catalog_method_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_multivalue_key_list b/bt5/erp5_legacy/bt/template_catalog_multivalue_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_related_key_list b/bt5/erp5_legacy/bt/template_catalog_related_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_request_key_list b/bt5/erp5_legacy/bt/template_catalog_request_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_result_key_list b/bt5/erp5_legacy/bt/template_catalog_result_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_result_table_list b/bt5/erp5_legacy/bt/template_catalog_result_table_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_role_key_list b/bt5/erp5_legacy/bt/template_catalog_role_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_scriptable_key_list b/bt5/erp5_legacy/bt/template_catalog_scriptable_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_catalog_topic_key_list b/bt5/erp5_legacy/bt/template_catalog_topic_key_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_constraint_id_list b/bt5/erp5_legacy/bt/template_constraint_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_extension_id_list b/bt5/erp5_legacy/bt/template_extension_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_local_role_list b/bt5/erp5_legacy/bt/template_local_role_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_local_roles_list b/bt5/erp5_legacy/bt/template_local_roles_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_message_translation_list b/bt5/erp5_legacy/bt/template_message_translation_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_module_id_list b/bt5/erp5_legacy/bt/template_module_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_path_list b/bt5/erp5_legacy/bt/template_path_list
deleted file mode 100644
index c967b9a0c4..0000000000
--- a/bt5/erp5_legacy/bt/template_path_list
+++ /dev/null
@@ -1,56 +0,0 @@
-portal_deliveries/internal_packing_list_builder
-portal_deliveries/internal_packing_list_builder/**
-portal_deliveries/payment_transaction_builder
-portal_deliveries/payment_transaction_builder/**
-portal_deliveries/purchase_invoice_builder
-portal_deliveries/purchase_invoice_builder/**
-portal_deliveries/purchase_invoice_transaction_builder
-portal_deliveries/purchase_invoice_transaction_builder/**
-portal_deliveries/purchase_invoice_transaction_trade_model_builder
-portal_deliveries/purchase_invoice_transaction_trade_model_builder/**
-portal_deliveries/purchase_packing_list_builder
-portal_deliveries/purchase_packing_list_builder/**
-portal_deliveries/sale_invoice_builder
-portal_deliveries/sale_invoice_builder/**
-portal_deliveries/sale_invoice_transaction_builder
-portal_deliveries/sale_invoice_transaction_builder/**
-portal_deliveries/sale_invoice_transaction_trade_model_builder
-portal_deliveries/sale_invoice_transaction_trade_model_builder/**
-portal_deliveries/sale_packing_list_builder
-portal_deliveries/sale_packing_list_builder/**
-portal_deliveries/task_invoice_builder
-portal_deliveries/task_invoice_builder/**
-portal_deliveries/task_report_builder
-portal_deliveries/task_report_builder/**
-portal_rules/default_accounting_transaction_root_simulation_rule
-portal_rules/default_accounting_transaction_root_simulation_rule/**
-portal_rules/default_delivery_root_simulation_rule
-portal_rules/default_delivery_root_simulation_rule/**
-portal_rules/default_delivery_rule
-portal_rules/default_delivery_rule/**
-portal_rules/default_delivery_simulation_rule
-portal_rules/default_delivery_simulation_rule/**
-portal_rules/default_invoice_root_simulation_rule
-portal_rules/default_invoice_root_simulation_rule/**
-portal_rules/default_invoice_rule
-portal_rules/default_invoice_rule/**
-portal_rules/default_invoice_simulation_rule
-portal_rules/default_invoice_simulation_rule/**
-portal_rules/default_invoice_transaction_rule
-portal_rules/default_invoice_transaction_rule/**
-portal_rules/default_invoice_transaction_simulation_rule
-portal_rules/default_invoice_transaction_simulation_rule/**
-portal_rules/default_invoicing_rule
-portal_rules/default_invoicing_rule/**
-portal_rules/default_order_root_simulation_rule
-portal_rules/default_order_root_simulation_rule/**
-portal_rules/default_order_rule
-portal_rules/default_order_rule/**
-portal_rules/default_payment_rule
-portal_rules/default_payment_rule/**
-portal_rules/default_payment_simulation_rule
-portal_rules/default_payment_simulation_rule/**
-portal_rules/default_trade_model_rule
-portal_rules/default_trade_model_rule/**
-portal_rules/default_trade_model_simulation_rule
-portal_rules/default_trade_model_simulation_rule/**
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_legacy/bt/template_portal_type_allowed_content_type_list
deleted file mode 100644
index b0743aee6c..0000000000
--- a/bt5/erp5_legacy/bt/template_portal_type_allowed_content_type_list
+++ /dev/null
@@ -1,4 +0,0 @@
-Business Process | Business Path
-Business Process | Business State
-Purchase Order | Trade Model Line
-Sale Order | Trade Model Line
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_portal_type_base_category_list b/bt5/erp5_legacy/bt/template_portal_type_base_category_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_legacy/bt/template_portal_type_hidden_content_type_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_portal_type_id_list b/bt5/erp5_legacy/bt/template_portal_type_id_list
deleted file mode 100644
index a8f51356f1..0000000000
--- a/bt5/erp5_legacy/bt/template_portal_type_id_list
+++ /dev/null
@@ -1,2 +0,0 @@
-Business Path
-Business State
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_portal_type_role_list b/bt5/erp5_legacy/bt/template_portal_type_role_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_portal_type_roles_list b/bt5/erp5_legacy/bt/template_portal_type_roles_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_portal_type_workflow_chain_list b/bt5/erp5_legacy/bt/template_portal_type_workflow_chain_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_preference_list b/bt5/erp5_legacy/bt/template_preference_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_product_id_list b/bt5/erp5_legacy/bt/template_product_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_property_sheet_id_list b/bt5/erp5_legacy/bt/template_property_sheet_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_registered_skin_selection_list b/bt5/erp5_legacy/bt/template_registered_skin_selection_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_role_list b/bt5/erp5_legacy/bt/template_role_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_site_property_id_list b/bt5/erp5_legacy/bt/template_site_property_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_skin_id_list b/bt5/erp5_legacy/bt/template_skin_id_list
deleted file mode 100644
index 5ffa871985..0000000000
--- a/bt5/erp5_legacy/bt/template_skin_id_list
+++ /dev/null
@@ -1 +0,0 @@
-erp5_legacy
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_test_id_list b/bt5/erp5_legacy/bt/template_test_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_tool_id_list b/bt5/erp5_legacy/bt/template_tool_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/template_workflow_id_list b/bt5/erp5_legacy/bt/template_workflow_id_list
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_legacy/bt/title b/bt5/erp5_legacy/bt/title
deleted file mode 100644
index 5ffa871985..0000000000
--- a/bt5/erp5_legacy/bt/title
+++ /dev/null
@@ -1 +0,0 @@
-erp5_legacy
\ No newline at end of file
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_project_simulation_legacy/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_project_simulation_legacy/bt/copyright_list b/bt5/erp5_project_simulation_legacy/bt/copyright_list
new file mode 100644
index 0000000000..fe948b9fb7
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2010 Nexedi SA
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/dependency_list b/bt5/erp5_project_simulation_legacy/bt/dependency_list
new file mode 100644
index 0000000000..a568716c83
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/dependency_list
@@ -0,0 +1,2 @@
+erp5_simulation_legacy
+erp5_project
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/license b/bt5/erp5_project_simulation_legacy/bt/license
new file mode 100644
index 0000000000..3a3e12bcad
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/revision b/bt5/erp5_project_simulation_legacy/bt/revision
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/template_format_version b/bt5/erp5_project_simulation_legacy/bt/template_format_version
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/template_path_list b/bt5/erp5_project_simulation_legacy/bt/template_path_list
new file mode 100644
index 0000000000..2dd9307796
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/template_path_list
@@ -0,0 +1,4 @@
+portal_deliveries/task_invoice_builder
+portal_deliveries/task_invoice_builder/**
+portal_deliveries/task_report_builder
+portal_deliveries/task_report_builder/**
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/template_update_business_template_workflow b/bt5/erp5_project_simulation_legacy/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/template_update_tool b/bt5/erp5_project_simulation_legacy/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/title b/bt5/erp5_project_simulation_legacy/bt/title
new file mode 100644
index 0000000000..9d0664b45a
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/title
@@ -0,0 +1 @@
+erp5_project_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_project_simulation_legacy/bt/version b/bt5/erp5_project_simulation_legacy/bt/version
new file mode 100644
index 0000000000..ceab6e11ec
--- /dev/null
+++ b/bt5/erp5_project_simulation_legacy/bt/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 81cd7d1979..b6e4ffda5e 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -1,60 +1,4 @@
 <allowed_content_type_list>
- <portal_type id="Delivery Root Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Delivery Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoice Root Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoice Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Invoice Transaction Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Order Root Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
- <portal_type id="Payment Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
  <portal_type id="Solver Process">
   <item>Solver Decision</item>
  </portal_type>
@@ -68,12 +12,4 @@
   <item>Action Information</item>
   <item>Role Information</item>
  </portal_type>
- <portal_type id="Trade Model Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
 </allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/change_log b/bt5/erp5_simulation/bt/change_log
index 4ee9c75845..e69de29bb2 100644
--- a/bt5/erp5_simulation/bt/change_log
+++ b/bt5/erp5_simulation/bt/change_log
@@ -1,2 +0,0 @@
-2009-10-29 - JPS
-* Initial proof of concept
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/dependency_list b/bt5/erp5_simulation/bt/dependency_list
index f7cf0d4aa1..1037d15c20 100644
--- a/bt5/erp5_simulation/bt/dependency_list
+++ b/bt5/erp5_simulation/bt/dependency_list
@@ -1,2 +1 @@
-erp5_invoicing
-erp5_accounting
+erp5_base
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
index c9357fd833..4708dd3fb3 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
@@ -1,53 +1,5 @@
-Delivery Root Simulation Rule | Category Membership Divergence Tester
-Delivery Root Simulation Rule | DateTime Divergence Tester
-Delivery Root Simulation Rule | Float Divergence Tester
-Delivery Root Simulation Rule | Net Converted Quantity Divergence Tester
-Delivery Root Simulation Rule | String Divergence Tester
-Delivery Root Simulation Rule | Variation Divergence Tester
-Delivery Simulation Rule | Category Membership Divergence Tester
-Delivery Simulation Rule | DateTime Divergence Tester
-Delivery Simulation Rule | Float Divergence Tester
-Delivery Simulation Rule | Net Converted Quantity Divergence Tester
-Delivery Simulation Rule | String Divergence Tester
-Delivery Simulation Rule | Variation Divergence Tester
-Invoice Root Simulation Rule | Category Membership Divergence Tester
-Invoice Root Simulation Rule | DateTime Divergence Tester
-Invoice Root Simulation Rule | Float Divergence Tester
-Invoice Root Simulation Rule | Net Converted Quantity Divergence Tester
-Invoice Root Simulation Rule | String Divergence Tester
-Invoice Root Simulation Rule | Variation Divergence Tester
-Invoice Simulation Rule | Category Membership Divergence Tester
-Invoice Simulation Rule | DateTime Divergence Tester
-Invoice Simulation Rule | Float Divergence Tester
-Invoice Simulation Rule | Net Converted Quantity Divergence Tester
-Invoice Simulation Rule | String Divergence Tester
-Invoice Simulation Rule | Variation Divergence Tester
-Invoice Transaction Simulation Rule | Category Membership Divergence Tester
-Invoice Transaction Simulation Rule | DateTime Divergence Tester
-Invoice Transaction Simulation Rule | Float Divergence Tester
-Invoice Transaction Simulation Rule | Net Converted Quantity Divergence Tester
-Invoice Transaction Simulation Rule | String Divergence Tester
-Invoice Transaction Simulation Rule | Variation Divergence Tester
-Order Root Simulation Rule | Category Membership Divergence Tester
-Order Root Simulation Rule | DateTime Divergence Tester
-Order Root Simulation Rule | Float Divergence Tester
-Order Root Simulation Rule | Net Converted Quantity Divergence Tester
-Order Root Simulation Rule | String Divergence Tester
-Order Root Simulation Rule | Variation Divergence Tester
-Payment Simulation Rule | Category Membership Divergence Tester
-Payment Simulation Rule | DateTime Divergence Tester
-Payment Simulation Rule | Float Divergence Tester
-Payment Simulation Rule | Net Converted Quantity Divergence Tester
-Payment Simulation Rule | String Divergence Tester
-Payment Simulation Rule | Variation Divergence Tester
 Solver Process Tool | Solver Process
 Solver Process | Solver Decision
 Solver Tool | Solver Type
 Solver Type | Action Information
-Solver Type | Role Information
-Trade Model Simulation Rule | Category Membership Divergence Tester
-Trade Model Simulation Rule | DateTime Divergence Tester
-Trade Model Simulation Rule | Float Divergence Tester
-Trade Model Simulation Rule | Net Converted Quantity Divergence Tester
-Trade Model Simulation Rule | String Divergence Tester
-Trade Model Simulation Rule | Variation Divergence Tester
\ No newline at end of file
+Solver Type | Role Information
\ No newline at end of file
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
similarity index 100%
rename from bt5/erp5_base/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
rename to bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Category%20Divergence%20Tester/view.xml
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
similarity index 100%
rename from bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
rename to bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Property%20Divergence%20Tester/view.xml
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml b/bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
similarity index 100%
rename from bt5/erp5_base/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
rename to bt5/erp5_simulation_legacy/ActionTemplateItem/portal_types/Quantity%20Divergence%20Tester/view.xml
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/BusinessProcess.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/BusinessProcess.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/BusinessProcess.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/BusinessProcess.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/DeliveryRootSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/DeliveryRootSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/DeliveryRootSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/DeliveryRootSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/DeliverySimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/DeliverySimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/DeliverySimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/DeliverySimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/InvoiceRootSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceRootSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/InvoiceRootSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceRootSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/InvoiceSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/InvoiceSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/InvoiceTransactionSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceTransactionSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/InvoiceTransactionSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/InvoiceTransactionSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/OrderRootSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/OrderRootSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/OrderRootSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/OrderRootSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/PaymentSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/PaymentSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/PaymentSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/PaymentSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/RootAppliedRuleCausalityMovementGroup.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/RootAppliedRuleCausalityMovementGroup.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/RootAppliedRuleCausalityMovementGroup.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/RootAppliedRuleCausalityMovementGroup.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/TradeModelSimulationRule.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/TradeModelSimulationRule.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/TradeModelSimulationRule.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/TradeModelSimulationRule.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/Transformation.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/Transformation.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/Transformation.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/Transformation.py
diff --git a/bt5/erp5_legacy/DocumentTemplateItem/TransformedResource.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/TransformedResource.py
similarity index 100%
rename from bt5/erp5_legacy/DocumentTemplateItem/TransformedResource.py
rename to bt5/erp5_simulation_legacy/DocumentTemplateItem/TransformedResource.py
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
similarity index 100%
rename from bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
rename to bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Category%20Divergence%20Tester.xml
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
similarity index 100%
rename from bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
rename to bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Property%20Divergence%20Tester.xml
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml b/bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
similarity index 100%
rename from bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
rename to bt5/erp5_simulation_legacy/PortalTypeTemplateItem/portal_types/Quantity%20Divergence%20Tester.xml
diff --git a/bt5/erp5_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
new file mode 100644
index 0000000000..89a65c0d4a
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -0,0 +1,14 @@
+<workflow_chain>
+ <chain>
+  <type>Category Divergence Tester</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Property Divergence Tester</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Quantity Divergence Tester</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
similarity index 95%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
index a758f1ef74..0c4f2b8026 100644
--- a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>erp5_legacy</string> </value>
+            <value> <string>erp5_simulation_legacy</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_description.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_description.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_description.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_solver_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_solver_list.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_solver_list.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_tested_property_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_tested_property_list.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_tested_property_list.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_title.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyDivergenceTester_view/my_title.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/PropertyDivergenceTester_view/my_title.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_alignment_enabled.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_exponent.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_exponent.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_exponent.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_rounding_option.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_decimal_rounding_option.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_description.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_description.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_description.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_solver_list.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_solver_list.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_solver_list.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_title.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QuantityDivergenceTester_view/my_title.xml
rename to bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/QuantityDivergenceTester_view/my_title.xml
diff --git a/bt5/erp5_simulation_legacy/bt/copyright_list b/bt5/erp5_simulation_legacy/bt/copyright_list
new file mode 100644
index 0000000000..fe948b9fb7
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2010 Nexedi SA
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/license b/bt5/erp5_simulation_legacy/bt/license
new file mode 100644
index 0000000000..3a3e12bcad
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/revision b/bt5/erp5_simulation_legacy/bt/revision
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_action_path_list b/bt5/erp5_simulation_legacy/bt/template_action_path_list
new file mode 100644
index 0000000000..ba7375e5e4
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_action_path_list
@@ -0,0 +1,3 @@
+Category Divergence Tester | view
+Property Divergence Tester | view
+Quantity Divergence Tester | view
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_document_id_list b/bt5/erp5_simulation_legacy/bt/template_document_id_list
similarity index 100%
rename from bt5/erp5_legacy/bt/template_document_id_list
rename to bt5/erp5_simulation_legacy/bt/template_document_id_list
diff --git a/bt5/erp5_simulation_legacy/bt/template_format_version b/bt5/erp5_simulation_legacy/bt/template_format_version
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_portal_type_id_list b/bt5/erp5_simulation_legacy/bt/template_portal_type_id_list
new file mode 100644
index 0000000000..d7a5a9e9ad
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_portal_type_id_list
@@ -0,0 +1,3 @@
+Category Divergence Tester
+Property Divergence Tester
+Quantity Divergence Tester
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_portal_type_workflow_chain_list b/bt5/erp5_simulation_legacy/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000..50244a5752
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_portal_type_workflow_chain_list
@@ -0,0 +1,3 @@
+Category Divergence Tester | edit_workflow
+Property Divergence Tester | edit_workflow
+Quantity Divergence Tester | edit_workflow
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_skin_id_list b/bt5/erp5_simulation_legacy/bt/template_skin_id_list
new file mode 100644
index 0000000000..4a4851b1a8
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_skin_id_list
@@ -0,0 +1 @@
+erp5_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_update_business_template_workflow b/bt5/erp5_simulation_legacy/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_update_tool b/bt5/erp5_simulation_legacy/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/title b/bt5/erp5_simulation_legacy/bt/title
new file mode 100644
index 0000000000..4a4851b1a8
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/title
@@ -0,0 +1 @@
+erp5_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/version b/bt5/erp5_simulation_legacy/bt/version
new file mode 100644
index 0000000000..ceab6e11ec
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/bt/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
diff --git a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 2a5d955706..6727c7ab1c 100644
--- a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -17,19 +17,20 @@
   <item>First Causality Movement Group</item>
  </portal_type>
  <portal_type id="Delivery Root Simulation Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
- <portal_type id="Delivery Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Delivery Simulation Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Internal Order">
   <item>Internal Order Line</item>
@@ -62,14 +63,12 @@
   <item>Inventory</item>
  </portal_type>
  <portal_type id="Order Root Simulation Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
- </portal_type>
- <portal_type id="Order Rule">
-  <item>Category Divergence Tester</item>
-  <item>Property Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Preference">
   <item>Sale Order</item>
@@ -125,10 +124,8 @@
  </portal_type>
  <portal_type id="Rule Tool">
   <item>Delivery Root Simulation Rule</item>
-  <item>Delivery Rule</item>
   <item>Delivery Simulation Rule</item>
   <item>Order Root Simulation Rule</item>
-  <item>Order Rule</item>
  </portal_type>
  <portal_type id="Sale Order">
   <item>Payment Condition</item>
diff --git a/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index aa9978b150..09333e11ee 100644
--- a/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -27,10 +27,6 @@
   <type>Delivery Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Delivery Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Delivery Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
@@ -75,10 +71,6 @@
   <type>Order Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
- <chain>
-  <type>Order Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Payment Condition</type>
   <workflow>edit_workflow</workflow>
diff --git a/bt5/erp5_trade/bt/dependency_list b/bt5/erp5_trade/bt/dependency_list
index 1ad9ae263c..fe3872c165 100644
--- a/bt5/erp5_trade/bt/dependency_list
+++ b/bt5/erp5_trade/bt/dependency_list
@@ -1,3 +1,4 @@
 erp5_core (>= 5.4.3)
 erp5_base
-erp5_pdm
\ No newline at end of file
+erp5_pdm
+erp5_simulation
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_action_path_list b/bt5/erp5_trade/bt/template_action_path_list
index f93ce351d7..0b9303eb83 100644
--- a/bt5/erp5_trade/bt/template_action_path_list
+++ b/bt5/erp5_trade/bt/template_action_path_list
@@ -8,7 +8,6 @@ Container Line | view_quantity
 Container | view
 Delivery Cell | view
 Delivery Root Simulation Rule | view
-Delivery Rule | view
 Delivery Simulation Rule | view
 First Causality Movement Group | view
 Internal Order Cell | view
@@ -49,7 +48,6 @@ Inventory | fast_input
 Inventory | fast_input_update
 Inventory | view
 Order Root Simulation Rule | view
-Order Rule | view
 Organisation | jump_to_purchase_order
 Organisation | jump_to_purchase_packing_list
 Organisation | jump_to_sale_order
diff --git a/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
index 31307dfe99..f61d2784b3 100644
--- a/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
@@ -5,15 +5,18 @@ Container Line | Container Cell
 Container | Container
 Container | Container Line
 Delivery Builder | First Causality Movement Group
-Delivery Root Simulation Rule | Category Divergence Tester
-Delivery Root Simulation Rule | Property Divergence Tester
-Delivery Root Simulation Rule | Quantity Divergence Tester
-Delivery Rule | Category Divergence Tester
-Delivery Rule | Property Divergence Tester
-Delivery Rule | Quantity Divergence Tester
-Delivery Simulation Rule | Category Divergence Tester
-Delivery Simulation Rule | Property Divergence Tester
-Delivery Simulation Rule | Quantity Divergence Tester
+Delivery Root Simulation Rule | Category Membership Divergence Tester
+Delivery Root Simulation Rule | DateTime Divergence Tester
+Delivery Root Simulation Rule | Float Divergence Tester
+Delivery Root Simulation Rule | Net Converted Quantity Divergence Tester
+Delivery Root Simulation Rule | String Divergence Tester
+Delivery Root Simulation Rule | Variation Divergence Tester
+Delivery Simulation Rule | Category Membership Divergence Tester
+Delivery Simulation Rule | DateTime Divergence Tester
+Delivery Simulation Rule | Float Divergence Tester
+Delivery Simulation Rule | Net Converted Quantity Divergence Tester
+Delivery Simulation Rule | String Divergence Tester
+Delivery Simulation Rule | Variation Divergence Tester
 Internal Order Line | Internal Order Cell
 Internal Order Line | Internal Order Line
 Internal Order Module | Internal Order
@@ -26,12 +29,12 @@ Internal Packing List | Payment Condition
 Inventory Line | Inventory Cell
 Inventory Module | Inventory
 Inventory | Inventory Line
-Order Root Simulation Rule | Category Divergence Tester
-Order Root Simulation Rule | Property Divergence Tester
-Order Root Simulation Rule | Quantity Divergence Tester
-Order Rule | Category Divergence Tester
-Order Rule | Property Divergence Tester
-Order Rule | Quantity Divergence Tester
+Order Root Simulation Rule | Category Membership Divergence Tester
+Order Root Simulation Rule | DateTime Divergence Tester
+Order Root Simulation Rule | Float Divergence Tester
+Order Root Simulation Rule | Net Converted Quantity Divergence Tester
+Order Root Simulation Rule | String Divergence Tester
+Order Root Simulation Rule | Variation Divergence Tester
 Preference | Sale Order
 Purchase Order Line | Purchase Order Cell
 Purchase Order Line | Purchase Order Line
@@ -55,10 +58,8 @@ Returned Sale Packing List Module | Returned Sale Packing List
 Returned Sale Packing List | Payment Condition
 Returned Sale Packing List | Returned Sale Packing List Line
 Rule Tool | Delivery Root Simulation Rule
-Rule Tool | Delivery Rule
 Rule Tool | Delivery Simulation Rule
 Rule Tool | Order Root Simulation Rule
-Rule Tool | Order Rule
 Sale Order Line | Sale Order Cell
 Sale Order Line | Sale Order Line
 Sale Order Module | Sale Order
diff --git a/bt5/erp5_trade/bt/template_portal_type_id_list b/bt5/erp5_trade/bt/template_portal_type_id_list
index 8252239338..b84f836f1a 100644
--- a/bt5/erp5_trade/bt/template_portal_type_id_list
+++ b/bt5/erp5_trade/bt/template_portal_type_id_list
@@ -6,7 +6,6 @@ Container Cell
 Container Line
 Delivery Cell
 Delivery Root Simulation Rule
-Delivery Rule
 Delivery Simulation Rule
 First Causality Movement Group
 Internal Order
@@ -22,7 +21,6 @@ Inventory Cell
 Inventory Line
 Inventory Module
 Order Root Simulation Rule
-Order Rule
 Payment Condition
 Purchase Order
 Purchase Order Cell
diff --git a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
index c8fa56095e..cf4a9e4dbc 100644
--- a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
@@ -14,8 +14,6 @@ Delivery Cell | delivery_movement_causality_interaction_workflow
 Delivery Cell | delivery_movement_simulation_interaction_workflow
 Delivery Root Simulation Rule | edit_workflow
 Delivery Root Simulation Rule | rule_validation_workflow
-Delivery Rule | edit_workflow
-Delivery Rule | rule_validation_workflow
 Delivery Simulation Rule | edit_workflow
 Delivery Simulation Rule | rule_validation_workflow
 Internal Order Cell | delivery_movement_causality_interaction_workflow
@@ -55,8 +53,6 @@ Inventory | edit_workflow
 Inventory | inventory_workflow
 Order Root Simulation Rule | edit_workflow
 Order Root Simulation Rule | rule_validation_workflow
-Order Rule | edit_workflow
-Order Rule | rule_validation_workflow
 Payment Condition | edit_workflow
 Purchase Order Cell | delivery_movement_causality_interaction_workflow
 Purchase Order Cell | delivery_movement_simulation_interaction_workflow
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/profile.xml
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view.xml
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20Path/view_advanced.xml
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Business%20State/view.xml
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Delivery%20Rule/view.xml
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml
similarity index 100%
rename from bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Rule/view.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Order%20Rule/view.xml
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model_line_list.xml
diff --git a/bt5/erp5_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml b/bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
similarity index 100%
rename from bt5/erp5_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
rename to bt5/erp5_trade_simulation_legacy/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model_line_list.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/causality_assignment_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/order_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/property_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/internal_packing_list_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/causality_assignment_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/order_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/purchase_packing_list_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/base_variant_movement_group_in_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/category_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/causality_assignment_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/order_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_delivery.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/property_movement_group_on_line.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_deliveries/sale_packing_list_builder/variant_movement_group_on_cell.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_root_simulation_rule/default_property_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_quantity_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_rule/default_property_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoice_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_property_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_invoicing_rule/default_quantity_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_delivery_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_property_tester.xml
diff --git a/bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml b/bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
similarity index 100%
rename from bt5/erp5_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
rename to bt5/erp5_trade_simulation_legacy/PathTemplateItem/portal_rules/default_order_rule/default_quantity_tester.xml
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
new file mode 100644
index 0000000000..6de16f0f8e
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -0,0 +1,41 @@
+<allowed_content_type_list>
+ <portal_type id="Business Process">
+  <item>Business Path</item>
+  <item>Business State</item>
+ </portal_type>
+ <portal_type id="Delivery Root Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Delivery Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Delivery Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Order Root Simulation Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Order Rule">
+  <item>Category Divergence Tester</item>
+  <item>Property Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Purchase Order">
+  <item>Trade Model Line</item>
+ </portal_type>
+ <portal_type id="Rule Tool">
+  <item>Delivery Rule</item>
+  <item>Order Rule</item>
+ </portal_type>
+ <portal_type id="Sale Order">
+  <item>Trade Model Line</item>
+ </portal_type>
+</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_legacy/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_trade_simulation_legacy/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
similarity index 100%
rename from bt5/erp5_legacy/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
rename to bt5/erp5_trade_simulation_legacy/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
diff --git a/bt5/erp5_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
similarity index 100%
rename from bt5/erp5_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
rename to bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20Path.xml
diff --git a/bt5/erp5_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
similarity index 100%
rename from bt5/erp5_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
rename to bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Business%20State.xml
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
similarity index 100%
rename from bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
rename to bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
similarity index 100%
rename from bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
rename to bt5/erp5_trade_simulation_legacy/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
diff --git a/bt5/erp5_trade_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_trade_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
new file mode 100644
index 0000000000..feea1bd688
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -0,0 +1,10 @@
+<workflow_chain>
+ <chain>
+  <type>Delivery Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Order Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
new file mode 100644
index 0000000000..d042179309
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>30.0</float> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_trade_simulation_legacy</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_getDefaultDestinationList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_getDefaultDestinationList.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultDestinationList.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_getDefaultSourceList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_getDefaultSourceList.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_getDefaultSourceList.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_delivery_mode.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_delivery_mode.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_delivery_mode.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_description.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_description.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_description.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_efficiency.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_efficiency.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_efficiency.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_end_of.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_end_of.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_end_of.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_incoterm.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_incoterm.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_incoterm.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_int_index.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_int_index.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_int_index.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_lead_time.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_lead_time.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_lead_time.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_payment_mode.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_payment_mode.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_payment_mode.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_quantity.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_quantity.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_quantity.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_reference.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_reference.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_wait_time.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_view/my_wait_time.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_view/my_wait_time.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_completed_state_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_deliverable.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_deliverable.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_delivery_builder_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_destination_method_id.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_frozen_state_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_order_builder_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_predecessor_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_source_method_id.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_successor_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_successor_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewAdvanced/my_trade_phase.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_administration_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_carrier_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_decision_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_payment.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_payment.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_payment.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_project_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_project_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_reference.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_reference.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_section_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_section_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_destination_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_destination_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_administration_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_administration_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_carrier_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_decision_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_decision_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_payment.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_payment.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_payment.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_project_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_project_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_project_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_reference.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_reference.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_section_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_section_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_section_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessPath_viewProfile/my_source_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessPath_viewProfile/my_source_title.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_description.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_description.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_description.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_int_index.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_int_index.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_int_index.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_reference.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_reference.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/BusinessState_view/my_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/BusinessState_view/my_title.xml
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_asPredicate.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_asPredicate.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/DeliveryRule_asPredicate.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_application_title_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_base_contribution_title_list.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_price.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_price.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/listbox_reference.xml
diff --git a/bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/my_title.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml
similarity index 100%
rename from bt5/erp5_legacy/SkinTemplateItem/portal_skins/erp5_legacy/Delivery_viewTradeModelLineList/my_title.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/Delivery_viewTradeModelLineList/my_title.xml
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_asPredicate.xml b/bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.xml
similarity index 100%
rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_asPredicate.xml
rename to bt5/erp5_trade_simulation_legacy/SkinTemplateItem/portal_skins/erp5_trade_simulation_legacy/OrderRule_asPredicate.xml
diff --git a/bt5/erp5_trade_simulation_legacy/bt/copyright_list b/bt5/erp5_trade_simulation_legacy/bt/copyright_list
new file mode 100644
index 0000000000..fe948b9fb7
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2010 Nexedi SA
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/dependency_list b/bt5/erp5_trade_simulation_legacy/bt/dependency_list
new file mode 100644
index 0000000000..0ece00cba9
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/dependency_list
@@ -0,0 +1,2 @@
+erp5_simulation_legacy
+erp5_trade
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/license b/bt5/erp5_trade_simulation_legacy/bt/license
new file mode 100644
index 0000000000..3a3e12bcad
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/revision b/bt5/erp5_trade_simulation_legacy/bt/revision
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_action_path_list b/bt5/erp5_trade_simulation_legacy/bt/template_action_path_list
similarity index 64%
rename from bt5/erp5_legacy/bt/template_action_path_list
rename to bt5/erp5_trade_simulation_legacy/bt/template_action_path_list
index 7412af6b93..da9aeb4ef3 100644
--- a/bt5/erp5_legacy/bt/template_action_path_list
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_action_path_list
@@ -2,5 +2,7 @@ Business Path | profile
 Business Path | view
 Business Path | view_advanced
 Business State | view
+Delivery Rule | view
+Order Rule | view
 Purchase Order | view_trade_model_line_list
 Sale Order | view_trade_model_line_list
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_format_version b/bt5/erp5_trade_simulation_legacy/bt/template_format_version
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_path_list b/bt5/erp5_trade_simulation_legacy/bt/template_path_list
new file mode 100644
index 0000000000..96c370fccf
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_path_list
@@ -0,0 +1,16 @@
+portal_deliveries/internal_packing_list_builder
+portal_deliveries/internal_packing_list_builder/**
+portal_deliveries/purchase_packing_list_builder
+portal_deliveries/purchase_packing_list_builder/**
+portal_deliveries/sale_packing_list_builder
+portal_deliveries/sale_packing_list_builder/**
+portal_rules/default_delivery_root_simulation_rule
+portal_rules/default_delivery_root_simulation_rule/**
+portal_rules/default_delivery_rule
+portal_rules/default_delivery_rule/**
+portal_rules/default_delivery_simulation_rule
+portal_rules/default_delivery_simulation_rule/**
+portal_rules/default_order_root_simulation_rule
+portal_rules/default_order_root_simulation_rule/**
+portal_rules/default_order_rule
+portal_rules/default_order_rule/**
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_allowed_content_type_list
new file mode 100644
index 0000000000..9841c362d5
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_allowed_content_type_list
@@ -0,0 +1,21 @@
+Business Process | Business Path
+Business Process | Business State
+Delivery Root Simulation Rule | Category Divergence Tester
+Delivery Root Simulation Rule | Property Divergence Tester
+Delivery Root Simulation Rule | Quantity Divergence Tester
+Delivery Rule | Category Divergence Tester
+Delivery Rule | Property Divergence Tester
+Delivery Rule | Quantity Divergence Tester
+Delivery Simulation Rule | Category Divergence Tester
+Delivery Simulation Rule | Property Divergence Tester
+Delivery Simulation Rule | Quantity Divergence Tester
+Order Root Simulation Rule | Category Divergence Tester
+Order Root Simulation Rule | Property Divergence Tester
+Order Root Simulation Rule | Quantity Divergence Tester
+Order Rule | Category Divergence Tester
+Order Rule | Property Divergence Tester
+Order Rule | Quantity Divergence Tester
+Purchase Order | Trade Model Line
+Rule Tool | Delivery Rule
+Rule Tool | Order Rule
+Sale Order | Trade Model Line
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_id_list b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_id_list
new file mode 100644
index 0000000000..80010301b9
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_id_list
@@ -0,0 +1,4 @@
+Business Path
+Business State
+Delivery Rule
+Order Rule
\ No newline at end of file
diff --git a/bt5/erp5_legacy/bt/template_portal_type_property_sheet_list b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_property_sheet_list
similarity index 100%
rename from bt5/erp5_legacy/bt/template_portal_type_property_sheet_list
rename to bt5/erp5_trade_simulation_legacy/bt/template_portal_type_property_sheet_list
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_workflow_chain_list b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000..17035437a3
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_portal_type_workflow_chain_list
@@ -0,0 +1,4 @@
+Delivery Rule | edit_workflow
+Delivery Rule | rule_validation_workflow
+Order Rule | edit_workflow
+Order Rule | rule_validation_workflow
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_skin_id_list b/bt5/erp5_trade_simulation_legacy/bt/template_skin_id_list
new file mode 100644
index 0000000000..e4d67d2b23
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_skin_id_list
@@ -0,0 +1 @@
+erp5_trade_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_update_business_template_workflow b/bt5/erp5_trade_simulation_legacy/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/template_update_tool b/bt5/erp5_trade_simulation_legacy/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/title b/bt5/erp5_trade_simulation_legacy/bt/title
new file mode 100644
index 0000000000..e4d67d2b23
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/title
@@ -0,0 +1 @@
+erp5_trade_simulation_legacy
\ No newline at end of file
diff --git a/bt5/erp5_trade_simulation_legacy/bt/version b/bt5/erp5_trade_simulation_legacy/bt/version
new file mode 100644
index 0000000000..ceab6e11ec
--- /dev/null
+++ b/bt5/erp5_trade_simulation_legacy/bt/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
diff --git a/product/ERP5/tests/testAccounting.py b/product/ERP5/tests/testAccounting.py
index 02ff730841..3e0ed03737 100644
--- a/product/ERP5/tests/testAccounting.py
+++ b/product/ERP5/tests/testAccounting.py
@@ -3067,8 +3067,8 @@ class TestAccountingWithSequences(ERP5TypeTestCase):
 
   def getBusinessTemplateList(self):
     """Returns list of BT to be installed."""
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
-            'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_simulation_test')
 
   # XXX
   def playSequence(self, sequence_string, quiet=1) :
diff --git a/product/ERP5/tests/testAccountingRules.py b/product/ERP5/tests/testAccountingRules.py
index c0e5ad97d3..d6b5bed39e 100644
--- a/product/ERP5/tests/testAccountingRules.py
+++ b/product/ERP5/tests/testAccountingRules.py
@@ -94,8 +94,9 @@ class TestAccountingRulesMixin:
 
   def getBusinessTemplateList(self):
     """  Return the list of business templates. """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting',
-        'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base','erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing',
+            'erp5_simulation_test')
 
   def getAccountModule(self):
     return getattr(self.getPortal(), 'account',
diff --git a/product/ERP5/tests/testAdvancedInvoicing.py b/product/ERP5/tests/testAdvancedInvoicing.py
index b5c3cdb36c..a11b313add 100644
--- a/product/ERP5/tests/testAdvancedInvoicing.py
+++ b/product/ERP5/tests/testAdvancedInvoicing.py
@@ -127,9 +127,9 @@ class TestAdvancedInvoice(TestSaleInvoiceMixin, ERP5TypeTestCase):
   invoice_transaction_line_portal_type = 'Sale Invoice Transaction Line'
   
   def getBusinessTemplateList(self):
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
-            'erp5_invoicing', 'erp5_advanced_invoicing', 'erp5_apparel',
-            'erp5_project', 'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_invoicing', 'erp5_advanced_invoicing',
+            'erp5_apparel', 'erp5_project', 'erp5_simulation_test')
 
   def stepStartRelatedInvoice(self, sequence=None, sequence_list=None, **kw):
     packing_list = sequence.get('packing_list')
diff --git a/product/ERP5/tests/testBPMCore.py b/product/ERP5/tests/testBPMCore.py
index b10e854caf..9e83486bdc 100644
--- a/product/ERP5/tests/testBPMCore.py
+++ b/product/ERP5/tests/testBPMCore.py
@@ -41,9 +41,9 @@ class TestBPMMixin(ERP5TypeTestCase):
   """Skeletons for tests which depend on BPM"""
 
   def getBusinessTemplateList(self):
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
-      'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_simulation',
-      'erp5_simulation_test')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing',
+            'erp5_simulation_test')
 
   business_process_portal_type = 'Business Process'
   business_link_portal_type = 'Business Link'
diff --git a/product/ERP5/tests/testConversionInSimulation.py b/product/ERP5/tests/testConversionInSimulation.py
index 512d7a5ab3..6b26933ece 100644
--- a/product/ERP5/tests/testConversionInSimulation.py
+++ b/product/ERP5/tests/testConversionInSimulation.py
@@ -157,13 +157,12 @@ class TestConversionInSimulation(AccountingTestCase,ERP5TypeTestCase):
     """
     return ('erp5_base',
             'erp5_pdm',
+            'erp5_simulation',
             'erp5_trade',
             'erp5_accounting',
             'erp5_accounting_ui_test',
             'erp5_invoicing',
             'erp5_simplified_invoicing',
-            'erp5_accounting', 
-            'erp5_simulation',
             'erp5_simulation_test',
             )
 
diff --git a/product/ERP5/tests/testERP5Commerce.py b/product/ERP5/tests/testERP5Commerce.py
index c3d9975309..35c860259c 100644
--- a/product/ERP5/tests/testERP5Commerce.py
+++ b/product/ERP5/tests/testERP5Commerce.py
@@ -103,12 +103,11 @@ class TestCommerce(ERP5TypeTestCase):
     """
     return ('erp5_base',
             'erp5_web',
-            'erp5_trade',
             'erp5_pdm',
-            'erp5_commerce',
-            'erp5_accounting', 
             'erp5_simulation',
-            'erp5_simulation_test',)
+            'erp5_trade',
+            'erp5_commerce',
+            'erp5_simulation_test')
 
   def afterSetUp(self):
     uf = self.getPortal().acl_users
diff --git a/product/ERP5/tests/testERP5Simulation.py b/product/ERP5/tests/testERP5Simulation.py
index a58dbc2833..8177743b36 100644
--- a/product/ERP5/tests/testERP5Simulation.py
+++ b/product/ERP5/tests/testERP5Simulation.py
@@ -41,10 +41,6 @@ from Products.ERP5Type.tests.backportUnittest import expectedFailure
 from Products.ERP5Type.Document.BusinessTemplate import getChainByType
 
 class TestERP5SimulationMixin(TestInvoiceMixin):
-  def getBusinessTemplateList(self):
-    return list(TestInvoiceMixin.getBusinessTemplateList(self)) + \
-           ['erp5_administration', 'erp5_accounting', 'erp5_simulation',
-            'erp5_simulation_test']
 
   def afterSetUp(self, quiet=1, run=1):
     TestInvoiceMixin.afterSetUp(self)
diff --git a/product/ERP5/tests/testImmobilisation.py b/product/ERP5/tests/testImmobilisation.py
index c2f89f1ec8..9935f11474 100644
--- a/product/ERP5/tests/testImmobilisation.py
+++ b/product/ERP5/tests/testImmobilisation.py
@@ -78,16 +78,15 @@ class TestImmobilisationMixin(ERP5TypeTestCase):
       Return the list of business templates.
 
     """
-    return ( "erp5_base",
-            "erp5_trade",
+    return ("erp5_base",
             "erp5_pdm",# Needed by accounting
+            "erp5_simulation",
+            "erp5_trade",
             "erp5_accounting",
             "erp5_invoicing",
             "erp5_simplified_invoicing",
             "erp5_apparel", # In order to use items
             "erp5_immobilisation",
-             'erp5_accounting', 
-            "erp5_simulation",
             "erp5_simulation_test",
             )
 
diff --git a/product/ERP5/tests/testInventory.py b/product/ERP5/tests/testInventory.py
index 21834974b2..628347b6af 100644
--- a/product/ERP5/tests/testInventory.py
+++ b/product/ERP5/tests/testInventory.py
@@ -74,8 +74,8 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
   def getBusinessTemplateList(self):
     """Business Templates required for this test.
     """
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_apparel',
-            'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_apparel', 'erp5_simulation_test')
 
   def setUpPreferences(self):
     #create apparel variation preferences
diff --git a/product/ERP5/tests/testInventoryAPI.py b/product/ERP5/tests/testInventoryAPI.py
index 74270bc2be..b081c16d34 100644
--- a/product/ERP5/tests/testInventoryAPI.py
+++ b/product/ERP5/tests/testInventoryAPI.py
@@ -198,8 +198,8 @@ class InventoryAPITestCase(ERP5TypeTestCase):
     """ erp5_trade is required for transit_simulation_state
         erp5_apparel is required for item
     """
-    return ('erp5_base', 'erp5_pdm', 'erp5_dummy_movement', 'erp5_trade',
-            'erp5_apparel', 'erp5_project', 'erp5_accounting', 'erp5_simulation',
+    return ('erp5_base', 'erp5_pdm', 'erp5_dummy_movement', 'erp5_simulation',
+            'erp5_trade', 'erp5_apparel', 'erp5_project',
             'erp5_simulation_test')
 
   # TODO: move this to a base class {{{
diff --git a/product/ERP5/tests/testInvoice.py b/product/ERP5/tests/testInvoice.py
index 345d1388bf..7a23104584 100644
--- a/product/ERP5/tests/testInvoice.py
+++ b/product/ERP5/tests/testInvoice.py
@@ -81,10 +81,8 @@ class TestInvoiceMixin(TestPackingListMixin,
     return "Invoices"
 
   def getBusinessTemplateList(self):
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
-            'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_apparel',
-            'erp5_project', 'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test',
-            'erp5_administration')
+    return super(TestInvoiceMixin, self).getBusinessTemplateList() + (
+      'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing')
 
   @UnrestrictedMethod
   def createCategories(self):
diff --git a/product/ERP5/tests/testOrder.py b/product/ERP5/tests/testOrder.py
index b7843a0509..6a0cc8f8f8 100644
--- a/product/ERP5/tests/testOrder.py
+++ b/product/ERP5/tests/testOrder.py
@@ -51,7 +51,7 @@ def catalogObjectListWrapper(self, object_list, method_id_list=None,
     portal.catalogged_object_path_dict[q.getPath()] = 1
   transaction.commit()
 
-class TestOrderMixin:
+class TestOrderMixin(object):
 
   default_quantity = 99
   default_price = 555
@@ -71,8 +71,8 @@ class TestOrderMixin:
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_apparel',
-            'erp5_project', 'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test',
+    return ('erp5_base','erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_apparel', 'erp5_project', 'erp5_simulation_test',
             'erp5_administration')
 
   def login(self, quiet=0, run=1):
diff --git a/product/ERP5/tests/testProductionOrder.py b/product/ERP5/tests/testProductionOrder.py
index 8848aa91d7..af085db9d9 100644
--- a/product/ERP5/tests/testProductionOrder.py
+++ b/product/ERP5/tests/testProductionOrder.py
@@ -65,8 +65,8 @@ class TestProductionOrderMixin(TestOrderMixin):
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_mrp',
-            'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base','erp5_pdm', 'erp5_simulation', 'erp5_trade', 'erp5_mrp',
+            'erp5_simulation_test')
 
   def setUpPreferences(self):
     portal = self.getPortal()
diff --git a/product/ERP5/tests/testResource.py b/product/ERP5/tests/testResource.py
index 5e1b1adf72..55b094c273 100644
--- a/product/ERP5/tests/testResource.py
+++ b/product/ERP5/tests/testResource.py
@@ -63,8 +63,8 @@ class TestResource(ERP5TypeTestCase):
       Install needed business template
     """
     # Trade is needeed for pricing
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_apparel',
-            'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_apparel', 'erp5_simulation_test')
 
   def getTitle(self):
     return "Resource"
diff --git a/product/ERP5/tests/testTask.py b/product/ERP5/tests/testTask.py
index c21091bd57..77b1114915 100644
--- a/product/ERP5/tests/testTask.py
+++ b/product/ERP5/tests/testTask.py
@@ -115,8 +115,8 @@ class TestTaskMixin:
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_project', 
-            'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base','erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_project', 'erp5_simulation_test')
 
 #  def stepLogin(self, **kw):
 #    portal = self.getPortal()
diff --git a/product/ERP5/tests/testTaskReporting.py b/product/ERP5/tests/testTaskReporting.py
index c140c42aa9..5d72da3bdc 100644
--- a/product/ERP5/tests/testTaskReporting.py
+++ b/product/ERP5/tests/testTaskReporting.py
@@ -39,8 +39,8 @@ class TestTaskReporting(ERP5ReportTestCase):
 
   def getBusinessTemplateList(self):
     """Returns list of BT to be installed."""
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_project',
-            'erp5_accounting', 'erp5_simulation', 'erp5_simulation_test')
+    return ('erp5_base','erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_project', 'erp5_simulation_test')
 
   @reindex
   def _makeOneTask(self, simulation_state='planned', **kw):
diff --git a/product/ERP5/tests/testTransformation.py b/product/ERP5/tests/testTransformation.py
index ef6379dabc..a8a1bd1be1 100644
--- a/product/ERP5/tests/testTransformation.py
+++ b/product/ERP5/tests/testTransformation.py
@@ -108,9 +108,8 @@ class TestTransformation(TestTransformationMixin, BaseTestUnitConversion):
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_mrp', 'erp5_apparel',
-            'erp5_dummy_movement', 'erp5_project', 'erp5_accounting',
-            'erp5_simulation', 'erp5_simulation_test')
+    return TestTransformationMixin.getBusinessTemplateList(self) + (
+      'erp5_apparel', 'erp5_dummy_movement', 'erp5_project')
 
   def test_01_getAggregatedAmountListSimple(self):
     """
diff --git a/product/ERP5Legacy/tests/testLegacyBPMCore.py b/product/ERP5Legacy/tests/testLegacyBPMCore.py
index be27d823a1..d2bb895976 100644
--- a/product/ERP5Legacy/tests/testLegacyBPMCore.py
+++ b/product/ERP5Legacy/tests/testLegacyBPMCore.py
@@ -41,9 +41,11 @@ class TestBPMMixin(ERP5TypeTestCase):
   """Skeletons for tests which depend on BPM"""
 
   def getBusinessTemplateList(self):
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
-      'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_simulation',
-            'erp5_legacy')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing',
+            'erp5_simulation_legacy', 'erp5_trade_simulation_legacy',
+            'erp5_accounting_simulation_legacy',
+            'erp5_invoicing_simulation_legacy')
 
   business_process_portal_type = 'Business Process'
   business_path_portal_type = 'Business Path'
diff --git a/product/ERP5Legacy/tests/testLegacyBPMEvaluation.py b/product/ERP5Legacy/tests/testLegacyBPMEvaluation.py
deleted file mode 100644
index 167d840ab9..0000000000
--- a/product/ERP5Legacy/tests/testLegacyBPMEvaluation.py
+++ /dev/null
@@ -1,889 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
-#          Łukasz Nowak <luke@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility 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
-# guarantees and support are strongly advised 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.
-#
-##############################################################################
-"""
-This is BPM Evaluation Test class using erp5_bpm development Business Template
-
-Generally it tries to use two Business Processes - one with sequence very
-similar to normal ERP5 - TestBPMEvaluationDefaultProcessMixin, second one
-inverted - TestBPMEvaluationDifferentProcessMixin.
-
-It uses only Sale path to demonstrate BPM.
-
-It is advised to *NOT* remove erp5_administration.
-"""
-import unittest
-import transaction
-
-from Products.ERP5Legacy.tests.testLegacyBPMCore import TestBPMMixin
-
-from DateTime import DateTime
-
-class TestBPMEvaluationMixin(TestBPMMixin):
-  node_portal_type = 'Organisation'
-  order_portal_type = 'Sale Order'
-  order_line_portal_type = 'Sale Order Line'
-  packing_list_portal_type = 'Sale Packing List'
-  packing_list_line_portal_type = 'Sale Packing List Line'
-  trade_condition_portal_type = 'Sale Trade Condition'
-  invoice_portal_type = 'Sale Invoice Transaction'
-  product_portal_type = 'Product'
-  order_start_date = DateTime()
-  order_stop_date = order_start_date + 10
-
-  def getBusinessTemplateList(self):
-    return TestBPMMixin.getBusinessTemplateList(self) + ('erp5_bpm',
-        'erp5_administration', 'erp5_simulation', 'erp5_simulation_test')
-
-  def afterSetUp(self):
-    TestBPMMixin.afterSetUp(self)
-    self._createNodes()
-    self._createBusinessProcess()
-    self._createTradeCondition()
-    self._createRootDocument()
-    self._setUpRules()
-    self.stepTic()
-
-  def _setUpRules(self):
-    """Setups rules
-
-    Rules are part of configuration, so anything provided by Business
-    Templates or previous test runs is ignored - all old rules are invalidated
-    between tests and new rules are created, configured and validated.
-    """
-    self.rule_tool = self.portal.portal_rules
-    for rule in self.rule_tool.contentValues():
-      if rule.getValidationState() == 'validated':
-        rule.invalidate()
-    transaction.commit()
-    self._createOrderRootSimulationRule()
-    self._createDeliveryRootSimulationRule()
-    self._createDeliverySimulationRule()
-    self._createInvoiceSimulationRule()
-    self._createInvoiceRootSimulationRule()
-    self._createTradeModelSimulationRule()
-
-  def _createTradeRootSimulationRule(self, **kw):
-    edit_dict = {}
-    edit_dict.update(
-      trade_phase = 'default/delivery',
-    )
-    edit_dict.update(**kw)
-    rule = self.rule_tool.newContent(**edit_dict)
-
-    # matching providers
-    for category in ('delivery',):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=False,
-        matching_provider=True)
-
-    # divergence providers
-    for category in ('source_section',
-                     'resource',
-                     'destination_section',
-                     'source',
-                     'aggregate'):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Net Converted Quantity Divergence Tester',
-      title='quantity divergence tester',
-      tested_property='quantity',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-    for property_id in ('start_date', 'stop_date'):
-      rule.newContent(
-        portal_type='DateTime Divergence Tester',
-        title='%s divergence tester' % property_id,
-        tested_property=property_id,
-        quantity=0,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Float Divergence Tester',
-      title='price divergence tester',
-      tested_property='price',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-
-    return rule
-
-  def _createOrderRootSimulationRule(self):
-    rule = self._createTradeRootSimulationRule(portal_type='Order Root Simulation Rule',
-        trade_phase='default/order',                                       
-        reference='default_order_rule')
-    rule.validate()
-    transaction.commit()
-
-  def _createDeliveryRootSimulationRule(self):
-    rule = self._createTradeRootSimulationRule(portal_type='Delivery Root Simulation Rule',
-        reference='default_delivery_rule')
-    rule.validate()
-    transaction.commit()
-
-  def _createDeliverySimulationRule(self):
-    rule = self.rule_tool.newContent(portal_type='Delivery Simulation Rule',
-      reference='default_delivering_rule',
-      trade_phase='default/delivery',
-      test_method_id = ('SimulationMovement_testDeliverySimulationRule',)
-      )
-    # matching providers
-    for category in ('resource',):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=False,
-        matching_provider=True)
-    rule.newContent(
-      portal_type='Variation Divergence Tester',
-      title='variation divergence tester',
-      tested_property='variation_property_dict',
-      divergence_provider=False,
-      matching_provider=True)
-
-    # divergence providers
-    for category in ('resource',
-                     'source_section',
-                     'destination_section',
-                     'source',
-                     'source_function',
-                     'destination',
-                     'destination_function',
-                     'source_project',
-                     'destination_project',
-                     'aggregate',
-                     'price_currency',
-                     'base_contribution',
-                     'base_application',
-                     'source_account',
-                     'destination_account',
-                     ):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Net Converted Quantity Divergence Tester',
-      title='quantity divergence tester',
-      tested_property='quantity',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-    for property_id in ('start_date', 'stop_date'):
-      rule.newContent(
-        portal_type='DateTime Divergence Tester',
-        title='%s divergence tester' % property_id,
-        tested_property=property_id,
-        quantity=0,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Float Divergence Tester',
-      title='price divergence tester',
-      tested_property='price',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-
-    rule.validate()
-    transaction.commit()
-
-  def _createTradeModelSimulationRule(self):
-    rule = self.rule_tool.newContent(portal_type='Trade Model Simulation Rule',
-      reference='default_trade_model_rule',
-      test_method_id = ('SimulationMovement_testTradeModelSimulationRule',)
-      )
-    # matching providers
-    for category in ('resource',):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=False,
-        matching_provider=True)
-    rule.newContent(
-      portal_type='Variation Divergence Tester',
-      title='variation divergence tester',
-      tested_property='variation_property_dict',
-      divergence_provider=False,
-      matching_provider=True)
-
-    # divergence providers
-    for category in ('resource',
-                     'source_section',
-                     'destination_section',
-                     'source',
-                     'source_function',
-                     'destination_function',
-                     'source_project',
-                     'destination_project',
-                     'aggregate',
-                     'price_currency',
-                     'base_contribution',
-                     'base_application',
-                     'source_account',
-                     'destination_account',
-                     ):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Net Converted Quantity Divergence Tester',
-      title='quantity divergence tester',
-      tested_property='quantity',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-    for property_id in ('start_date', 'stop_date'):
-      rule.newContent(
-        portal_type='DateTime Divergence Tester',
-        title='%s divergence tester' % property_id,
-        tested_property=property_id,
-        quantity=0,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Float Divergence Tester',
-      title='price divergence tester',
-      tested_property='price',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-
-    rule.validate()
-    transaction.commit()
-
-  def _createInvoiceRootSimulationRule(self):
-    # Note: This is not used, but invoices, even if built from simulation,
-    #       need those rule to create empty one applied rule
-    rule_tool = self.portal.portal_rules
-
-    clipboard = rule_tool.manage_copyObjects(ids = ['new_invoice_root_simulation_rule'])
-    pasted = rule_tool.manage_pasteObjects(clipboard)
-    new_rule = getattr(rule_tool, pasted[0]['new_id'])
-    new_rule.validate()
-    transaction.commit()
-
-  def _createInvoiceSimulationRule(self):
-    edit_dict = {}
-    edit_dict.update(
-    )
-    rule = self.rule_tool.newContent(portal_type='Invoice Simulation Rule',
-      reference='default_invoicing_rule',
-      trade_phase = 'default/invoicing',
-      test_method_id = ('SimulationMovement_testInvoiceSimulationRule',)
-      )
-    # matching providers
-    for category in ('resource',):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=False,
-        matching_provider=True)
-    rule.newContent(
-      portal_type='Variation Divergence Tester',
-      title='variation divergence tester',
-      tested_property='variation_property_dict',
-      divergence_provider=False,
-      matching_provider=True)
-
-    # divergence providers
-    for category in ('resource',
-                     'source_section',
-                     'destination_section',
-                     'source',
-                     'source_function',
-                     'destination_function',
-                     'source_project',
-                     'destination_project',
-                     'aggregate',
-                     'price_currency',
-                     'base_contribution',
-                     'base_application',
-                     'source_account',
-                     'destination_account',
-                     ):
-      rule.newContent(
-        portal_type='Category Membership Divergence Tester',
-        title='%s divergence tester' % category,
-        tested_property=category,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Net Converted Quantity Divergence Tester',
-      title='quantity divergence tester',
-      tested_property='quantity',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-    for property_id in ('start_date', 'stop_date'):
-      rule.newContent(
-        portal_type='DateTime Divergence Tester',
-        title='%s divergence tester' % property_id,
-        tested_property=property_id,
-        quantity=0,
-        divergence_provider=True,
-        matching_provider=False)
-    rule.newContent(
-      portal_type='Float Divergence Tester',
-      title='price divergence tester',
-      tested_property='price',
-      quantity=0,
-      divergence_provider=True,
-      matching_provider=False)
-
-    rule.validate()
-    transaction.commit()
-
-  def _createDocument(self, portal_type, **kw):
-    module = self.portal.getDefaultModule(portal_type=portal_type)
-    return module.newContent(portal_type=portal_type, **kw)
-
-  def _createProduct(self, **kw):
-    return self._createDocument(self.product_portal_type, **kw)
-
-  def _createNode(self, **kw):
-    return self._createDocument(self.node_portal_type, **kw)
-
-  def _createTradeCondition(self, **kw):
-    self.trade_condition = self._createDocument(
-        self.trade_condition_portal_type,
-        title = self.id(),
-        specialise_value=self.business_process, **kw)
-
-  def _createRootDocumentLine(self, **kw):
-    return self.root_document.newContent(
-        portal_type=self.root_document_line_portal_type, **kw)
-
-  def _createNodes(self):
-    self.source, self.source_section = self._createNode(), self._createNode()
-    self.destination, self.destination_section = self._createNode() \
-        , self._createNode()
-
-  def _createBusinessStateList(self):
-    """Creates list of defaults states, set them on self as name_state property"""
-    for state_name in ('ordered', 'delivered', 'invoiced', 'accounted',
-        'paid'):
-      state_document = self.createBusinessState(self.business_process,
-        title=state_name)
-      setattr(self,'%s_state' % state_name, state_document)
-
-  def _createRootDocument(self):
-    self.root_document = self._createDocument(self.root_document_portal_type,
-        source_value = self.source,
-        source_section_value = self.source_section,
-        destination_value = self.destination,
-        destination_section_value = self.destination_section,
-        start_date = self.order_start_date,
-        stop_date = self.order_stop_date,
-        specialise_value = self.trade_condition)
-
-  def _checkBPMSimulation(self):
-    """Checks BPMised related simumation.
-
-    Note: Simulation tree is the same, it is totally independent from
-    BPM sequence"""
-    # TODO:
-    #  - gather errors into one list
-    bpm_root_rule = self.root_document.getCausalityRelatedValue(
-        portal_type='Applied Rule')
-    # check that correct root rule applied
-    self.assertEqual(bpm_root_rule.getSpecialiseValue().getPortalType(),
-        self.root_rule_portal_type)
-    root_simulation_movement_list = bpm_root_rule.contentValues()
-    for root_simulation_movement in root_simulation_movement_list:
-      self.assertEqual(root_simulation_movement.getPortalType(),
-          'Simulation Movement')
-      movement = root_simulation_movement.getDeliveryValue()
-      property_problem_list = []
-      # check some properties equality between delivery line and simulation
-      # movement, gather errors
-      for property in 'resource', 'price', 'start_date', 'stop_date', \
-                      'source', 'destination', 'source_section', \
-                      'destination_section':
-        if movement.getProperty(property) != root_simulation_movement \
-            .getProperty(property):
-          property_problem_list.append('property %s movement %s '
-              'simulation %s' % (property, movement.getProperty(property),
-                root_simulation_movement.getProperty(property)))
-      if len(property_problem_list) > 0:
-        self.fail('\n'.join(property_problem_list))
-      self.assertEqual(
-        movement.getQuantity() * root_simulation_movement.getDeliveryRatio(),
-        root_simulation_movement.getQuantity())
-      # root rule is order or delivery - so below each movement invoicing one
-      # is expected
-      self.assertEquals(len(root_simulation_movement.contentValues()), 1)
-      if self.root_rule_portal_type == 'Order Root Simulation Rule':
-        delivery_rule = root_simulation_movement.contentValues()[0]
-        delivery_simulation_movement_list = delivery_rule.contentValues()
-        self.assertEqual(1, len(delivery_simulation_movement_list))
-        delivery_simulation_movement = delivery_simulation_movement_list[0]
-      else:
-        delivery_simulation_movement = root_simulation_movement
-      for bpm_invoicing_rule in delivery_simulation_movement.contentValues():
-        self.assertEqual(bpm_invoicing_rule.getPortalType(), 'Applied Rule')
-        self.assertEqual(bpm_invoicing_rule.getSpecialiseValue() \
-            .getPortalType(), 'Invoice Simulation Rule')
-        # only one movement inside invoicing rule
-        self.assertEquals(len(bpm_invoicing_rule.contentValues()), 1)
-        for invoicing_simulation_movement in bpm_invoicing_rule \
-            .contentValues():
-          self.assertEqual(invoicing_simulation_movement.getPortalType(),
-              'Simulation Movement')
-          self.assertEqual(invoicing_simulation_movement.getCausalityValue(),
-              self.invoice_path)
-          property_problem_list = []
-          # check equality of some properties, gather them
-          for property in 'resource', 'price', 'start_date', \
-            'stop_date', 'source', 'destination', 'source_section', \
-            'destination_section':
-            if movement.getProperty(property) != \
-                invoicing_simulation_movement.getProperty(property):
-              property_problem_list.append('property %s movement %s '
-                  'simulation %s' % (property, movement.getProperty(property),
-                    invoicing_simulation_movement.getProperty(property)))
-          if len(property_problem_list) > 0:
-            self.fail('\n'.join(property_problem_list))
-          self.assertEqual(
-            movement.getQuantity() * root_simulation_movement.getDeliveryRatio(),
-            invoicing_simulation_movement.getQuantity())
-          # simple check for trade model rule existence, without movements,
-          # as no trade condition configured
-          self.assertEquals(
-              len(invoicing_simulation_movement.contentValues()), 1)
-          for trade_model_rule in invoicing_simulation_movement \
-              .contentValues():
-            self.assertEqual(trade_model_rule.getPortalType(), 'Applied Rule')
-            self.assertEqual(trade_model_rule.getSpecialiseValue() \
-                .getPortalType(), 'Trade Model Simulation Rule')
-            self.assertSameSet(trade_model_rule.contentValues(
-              portal_type='Simulation Movement'), [])
-
-class TestBPMEvaluationDefaultProcessMixin:
-  def _createBusinessProcess(self):
-    self.business_process = self.createBusinessProcess(title=self.id(),
-        referential_date='start_date')
-    self._createBusinessStateList()
-
-    self.order_path = self.createBusinessPath(self.business_process,
-        successor_value=self.ordered_state,
-        trade_phase='default/order',
-        deliverable=1,
-        completed_state_list=['confirmed'],
-        frozen_state_list=['confirmed'],
-        )
-
-    self.delivery_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.ordered_state,
-        successor_value=self.delivered_state,
-        trade_phase='default/delivery',
-        deliverable=1,
-        completed_state_list=['started', 'stopped', 'delivered'],
-        frozen_state_list=['started', 'stopped', 'delivered'],
-        delivery_builder='portal_deliveries/bpm_sale_packing_list_builder',
-        )
-
-    self.invoice_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.delivered_state,
-        successor_value=self.invoiced_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        delivery_builder='portal_deliveries/bpm_sale_invoice_builder',
-        trade_phase='default/invoicing')
-
-    self.account_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.invoiced_state,
-        successor_value=self.accounted_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        trade_phase='default/accounting')
-
-    self.pay_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.invoiced_state,
-        successor_value=self.accounted_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        trade_phase='default/payment')
-
-    self.stepTic()
-
-class TestBPMEvaluationDifferentProcessMixin:
-  def _createBusinessProcess(self):
-    self.business_process = self.createBusinessProcess(title=self.id(),
-        referential_date='start_date')
-    self._createBusinessStateList()
-
-    self.order_path = self.createBusinessPath(self.business_process,
-        successor_value=self.ordered_state,
-        trade_phase='default/order',
-        deliverable=1,
-        completed_state_list=['confirmed'],
-        frozen_state_list=['confirmed'],
-        )
-
-    self.invoice_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.ordered_state,
-        successor_value=self.invoiced_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        trade_phase='default/invoicing')
-
-    self.account_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.invoiced_state,
-        successor_value=self.accounted_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        trade_phase='default/accounting')
-
-    self.pay_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.accounted_state,
-        successor_value=self.paid_state,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'],
-        trade_phase='default/payment')
-
-    self.delivery_path = self.createBusinessPath(self.business_process,
-        predecessor_value=self.paid_state,
-        successor_value=self.delivered_state,
-        trade_phase='default/delivery',
-        deliverable=1,
-        completed_state_list=['delivered'],
-        frozen_state_list=['stopped', 'delivered'])
-
-    self.stepTic()
-
-class GenericRuleTestsMixin:
-  """Tests which are generic for BPMised Order, Delivery and Invoice Rule"""
-  def test_transition(self):
-    self.order_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self._doFirstTransition(self.root_document)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def _split(self):
-    """Invoke manual splitting"""
-    ratio = .5 # hardcoded value, hopefully float friendly
-    applied_rule = self.root_document.getCausalityRelatedValue(
-        portal_type='Applied Rule')
-    for movement in applied_rule.contentValues(
-        portal_type='Simulation Movement'):
-      new_movement = movement.Base_createCloneDocument(batch_mode=1)
-      old_quantity = movement.getQuantity()
-      movement.edit(
-        quantity = old_quantity * ratio
-      )
-
-      new_movement.edit(
-        quantity = old_quantity * (1 - ratio)
-      )
-
-    self.stepTic()
-
-    # recalculate order ratio
-    for movement in self.root_document.getMovementList():
-      movement_quantity = movement.getQuantity()
-      for simulation_movement in movement.getDeliveryRelatedValueList():
-        new_ratio = simulation_movement.getQuantity() / movement_quantity
-        simulation_movement.edit(order_ratio = new_ratio)
-        if simulation_movement.getDelivery() is not None:
-          simulation_movement.edit(delivery_ratio = new_ratio)
-
-    # reexpand
-    applied_rule.expand()
-    self.stepTic()
-
-    self._checkBPMSimulation()
-
-  def test_transition_split(self):
-    self.order_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self._doFirstTransition(self.root_document)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self._split()
-
-    # expand
-    self.root_document.edit(title = self.root_document.getTitle() + 'a')
-
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_split_line_add(self):
-    self.test_transition_split()
-    self.order_line_2 = self._createRootDocumentLine(
-        resource_value = self._createProduct(), quantity = 4, price = 2)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_split_line_add_split(self):
-    self.test_transition_split_line_add()
-
-    # second split
-    self._split()
-
-    # expand
-    self.root_document.edit(title = self.root_document.getTitle() + 'a')
-
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_line_edit(self):
-    self.test_transition()
-    self.order_line.edit(quantity = 8, price = 6)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_line_edit_add(self):
-    self.test_transition_line_edit()
-    self.order_line_2 = self._createRootDocumentLine(
-        resource_value = self._createProduct(), quantity = 4, price = 2)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_line_edit_add_many_transactions(self):
-    self.test_transition_line_edit()
-    self.order_line_9 = self._createRootDocumentLine()
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.order_line_9.edit(resource_value = self._createProduct())
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.order_line_9.edit(quantity = 1)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.order_line_9.edit(price = 33)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.order_line_9.edit(resource_value = self._createProduct())
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_line_edit_add_same_resource(self):
-    self.test_transition_line_edit()
-    resource = self.order_line.getResourceValue()
-    self.order_line_10 = self._createRootDocumentLine(
-      resource_value = resource, quantity = 9, price = 2)
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def test_transition_line_edit_add_same_resource_edit_again(self):
-    self.test_transition_line_edit_add_same_resource()
-
-    self.root_document.edit(title = self.root_document.getTitle() + 'a' )
-    self.stepTic()
-    self._checkBPMSimulation()
-
-class TestOrder(TestBPMEvaluationMixin, GenericRuleTestsMixin):
-  """Check BPMised Order Rule behaviour"""
-  root_document_portal_type = 'Sale Order'
-  root_document_line_portal_type = 'Sale Order Line'
-  root_rule_portal_type = 'Order Root Simulation Rule'
-
-  def _doFirstTransition(self, document):
-    document.plan()
-
-  def test_confirming(self):
-    self.order_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self.root_document.confirm()
-    self.stepTic()
-    self._checkBPMSimulation()
-    self.assertEqual(
-      2,
-      len(self.root_document.getCausalityRelatedList())
-    )
-    self.assertEqual(
-      'Applied Rule',
-      self.root_document.getCausalityRelatedValue(
-        portal_type='Applied Rule').getPortalType()
-    )
-
-    self.assertEqual(
-      self.packing_list_portal_type,
-      self.root_document.getCausalityRelatedValue(
-        portal_type=self.packing_list_portal_type).getPortalType()
-    )
-
-class TestPackingList(TestBPMEvaluationMixin, GenericRuleTestsMixin):
-  """Check BPM Delivery Rule behaviour"""
-  root_document_portal_type = 'Sale Packing List'
-  root_document_line_portal_type = 'Sale Packing List Line'
-  root_rule_portal_type = 'Delivery Root Simulation Rule'
-
-  def _packDelivery(self):
-    """Packs delivery fully, removes possible containers before"""
-    self.root_document.deleteContent(self.root_document.contentIds(
-      filter={'portal_type':'Container'}))
-    cont = self.root_document.newContent(portal_type='Container')
-    for movement in self.root_document.getMovementList():
-      cont.newContent(portal_type='Container Line',
-        resource = movement.getResource(), quantity = movement.getQuantity())
-    self.stepTic()
-    self._checkBPMSimulation()
-
-  def _doFirstTransition(self, document):
-    document.confirm()
-
-  def test_starting(self):
-    self.delivery_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self.root_document.confirm()
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self._packDelivery()
-
-    self.root_document.start()
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.assertEqual(
-      2,
-      len(self.root_document.getCausalityRelatedList())
-    )
-    self.assertEqual(
-      'Applied Rule',
-      self.root_document.getCausalityRelatedValue(
-        portal_type='Applied Rule').getPortalType()
-    )
-
-    self.assertEqual(
-      self.invoice_portal_type,
-      self.root_document.getCausalityRelatedValue(
-        portal_type=self.invoice_portal_type).getPortalType()
-    )
-
-class TestInvoice(TestBPMEvaluationMixin, GenericRuleTestsMixin):
-  """Check BPM Invoice Rule behaviour"""
-  # not implemented yet
-  pass
-
-class TestOrderDefaultProcess(TestOrder,
-    TestBPMEvaluationDefaultProcessMixin):
-  pass
-
-class TestPackingListDefaultProcess(TestPackingList,
-    TestBPMEvaluationDefaultProcessMixin):
-  pass
-
-class TestInvoiceDefaultProcess(TestInvoice,
-    TestBPMEvaluationDefaultProcessMixin):
-  pass
-
-class TestOrderDifferentProcess(TestOrder,
-    TestBPMEvaluationDifferentProcessMixin):
-  def test_confirming(self):
-    # in current BPM configuration nothing shall be built
-    # as soon as test business process will be finished, it shall built proper
-    # delivery
-    self.order_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self.root_document.confirm()
-    self.stepTic()
-    self._checkBPMSimulation()
-    self.assertEqual(
-      1,
-      len(self.root_document.getCausalityRelatedList())
-    )
-    self.assertEqual(
-      'Applied Rule',
-      self.root_document.getCausalityRelatedValue().getPortalType()
-    )
-
-class TestPackingListDifferentProcess(TestPackingList,
-    TestBPMEvaluationDifferentProcessMixin):
-  def test_starting(self):
-    self.delivery_line = self._createRootDocumentLine(
-      resource_value = self._createProduct(), quantity = 10, price = 5)
-    self.stepTic()
-
-    self.root_document.confirm()
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self._packDelivery()
-    self.root_document.start()
-    self.stepTic()
-    self._checkBPMSimulation()
-
-    self.assertEqual(
-      1,
-      len(self.root_document.getCausalityRelatedList())
-    )
-    self.assertEqual(
-      'Applied Rule',
-      self.root_document.getCausalityRelatedValue(
-        portal_type='Applied Rule').getPortalType()
-    )
-
-class TestInvoiceDifferentProcess(TestInvoice,
-    TestBPMEvaluationDifferentProcessMixin):
-  pass
-
-def test_suite():
-  suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestOrderDefaultProcess))
-  suite.addTest(unittest.makeSuite(TestPackingListDefaultProcess))
-#  suite.addTest(unittest.makeSuite(TestInvoiceDefaultProcess))
-
-  suite.addTest(unittest.makeSuite(TestOrderDifferentProcess))
-  suite.addTest(unittest.makeSuite(TestPackingListDifferentProcess))
-#  suite.addTest(unittest.makeSuite(TestInvoiceDifferentProcess))
-  return suite
diff --git a/product/ERP5Legacy/tests/testLegacyConversionInSimulation.py b/product/ERP5Legacy/tests/testLegacyConversionInSimulation.py
index ff866e0b69..27c319e97a 100644
--- a/product/ERP5Legacy/tests/testLegacyConversionInSimulation.py
+++ b/product/ERP5Legacy/tests/testLegacyConversionInSimulation.py
@@ -162,15 +162,12 @@ class TestConversionInSimulation(AccountingTestCase,ERP5TypeTestCase):
       the unit test framework in order to know which business templates
       need to be installed to run the test on.
     """
-    return ('erp5_base',
-            'erp5_pdm',
-            'erp5_trade',
-            'erp5_accounting',
-            'erp5_accounting_ui_test',
-            'erp5_invoicing',
-            'erp5_simplified_invoicing',
-            'erp5_simulation',
-            'erp5_legacy')
+    return ('erp5_base', 'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+            'erp5_accounting', 'erp5_accounting_ui_test', 'erp5_invoicing',
+            'erp5_simplified_invoicing', 'erp5_simulation_legacy',
+            'erp5_trade_simulation_legacy',
+            'erp5_accounting_simulation_legacy',
+            'erp5_invoicing_simulation_legacy')
 
   @UnrestrictedMethod
   def createInvoiceTransactionRule(self, resource=None):
diff --git a/product/ERP5Legacy/tests/testLegacyInvoice.py b/product/ERP5Legacy/tests/testLegacyInvoice.py
index 2db0f2d971..1fd1431eb6 100644
--- a/product/ERP5Legacy/tests/testLegacyInvoice.py
+++ b/product/ERP5Legacy/tests/testLegacyInvoice.py
@@ -81,6 +81,11 @@ class TestInvoiceMixin(TestPackingListMixin,
   def getTitle(self):
     return "Invoices"
 
+  def getBusinessTemplateList(self):
+    return super(TestInvoiceMixin, self).getBusinessTemplateList() + (
+      'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing',
+      'erp5_accounting_simulation_legacy', 'erp5_invoicing_simulation_legacy')
+
   @UnrestrictedMethod
   def createCategories(self):
     """Create the categories for our test. """
diff --git a/product/ERP5Legacy/tests/testLegacyOrder.py b/product/ERP5Legacy/tests/testLegacyOrder.py
index 93c353f231..f466d8e22f 100644
--- a/product/ERP5Legacy/tests/testLegacyOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyOrder.py
@@ -40,7 +40,7 @@ from zLOG import LOG
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.CMFCore.utils import getToolByName
 
-class TestOrderMixin:
+class TestOrderMixin(object):
 
   default_quantity = 99
   default_price = 555
@@ -60,9 +60,10 @@ class TestOrderMixin:
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting',
-            'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_apparel',
-            'erp5_project', 'erp5_simulation', 'erp5_legacy', 'erp5_administration')
+    return ('erp5_base', 'erp5_simulation', 'erp5_simulation_legacy',
+            'erp5_pdm', 'erp5_trade', 'erp5_apparel', 'erp5_project',
+            'erp5_trade_simulation_legacy', 'erp5_project_simulation_legacy',
+            'erp5_administration')
 
   def login(self, quiet=0, run=1):
     uf = self.getPortal().acl_users
diff --git a/product/ERP5Legacy/tests/testLegacyProductionOrder.py b/product/ERP5Legacy/tests/testLegacyProductionOrder.py
index 5d91821b79..832ac06757 100644
--- a/product/ERP5Legacy/tests/testLegacyProductionOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyProductionOrder.py
@@ -65,8 +65,7 @@ class TestProductionOrderMixin(TestOrderMixin):
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_mrp',
-            'erp5_accounting', 'erp5_invoicing', 'erp5_simulation', 'erp5_legacy')
+    return TestOrderMixin.getBusinessTemplateList(self) + ('erp5_mrp',)
 
   def setUpPreferences(self):
     portal = self.getPortal()
diff --git a/product/ERP5Legacy/tests/testLegacyRuleOrder.py b/product/ERP5Legacy/tests/testLegacyRuleOrder.py
index 6fd281c092..10b3978516 100644
--- a/product/ERP5Legacy/tests/testLegacyRuleOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyRuleOrder.py
@@ -71,9 +71,10 @@ class TestOrderMixin:
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting',
-            'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_apparel',
-            'erp5_project', 'erp5_simulation', 'erp5_legacy', 'erp5_administration')
+    return ('erp5_base', 'erp5_simulation', 'erp5_simulation_legacy',
+            'erp5_pdm', 'erp5_trade', 'erp5_apparel', 'erp5_project',
+            'erp5_trade_simulation_legacy', 'erp5_project_simulation_legacy',
+            'erp5_administration')
 
   def validateRules(self):
     """
diff --git a/product/ERP5Legacy/tests/testLegacySimulationInvoice.py b/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
index 601254600d..55672835aa 100644
--- a/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
+++ b/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
@@ -80,6 +80,11 @@ class TestInvoiceMixin(TestPackingListMixin,
   def getTitle(self):
     return "Invoices"
 
+  def getBusinessTemplateList(self):
+    return super(TestInvoiceMixin, self).getBusinessTemplateList() + (
+      'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing',
+      'erp5_accounting_simulation_legacy', 'erp5_invoicing_simulation_legacy')
+
   @UnrestrictedMethod
   def createCategories(self):
     """Create the categories for our test. """
diff --git a/product/ERP5Legacy/tests/testLegacyTradeCondition.py b/product/ERP5Legacy/tests/testLegacyTradeCondition.py
index 2808be4a22..d1ddff1612 100644
--- a/product/ERP5Legacy/tests/testLegacyTradeCondition.py
+++ b/product/ERP5Legacy/tests/testLegacyTradeCondition.py
@@ -37,10 +37,13 @@ class TradeConditionTestCase(ERP5TypeTestCase):
   """Tests for Trade Conditions and Tax
   """
   def getBusinessTemplateList(self):
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
+    return ('erp5_base', 'erp5_simulation', 'erp5_simulation_legacy',
+            'erp5_pdm', 'erp5_trade', 'erp5_accounting',
             'erp5_invoicing', 'erp5_tax_resource', 'erp5_discount_resource',
             'erp5_legacy_tax_system', 'erp5_simplified_invoicing',
-            'erp5_legacy')
+            'erp5_trade_simulation_legacy',
+            'erp5_accounting_simulation_legacy',
+            'erp5_invoicing_simulation_legacy')
 
   def validateRules(self):
     """
-- 
2.30.9