*: fix trade phase duplication in erp5_simulation_test and erp5_configurator_standard_categories

We had trade phase duplication: - `trade_phase/default/*` were provided by erp5_simulation_test - `trade_phase/trade/*` are provided by erp5_configurator_standard_categories so the former was only for testing and the later were actually used in instance configured by configurator. But in some paths from configurator_standard_*template, which are also used on configurated instances, were using trade_phase/default (the one from test). Some rules were referencing these categories, but apparenlty not using them. To fix this confusion, use trade_phase/trade/* everywhere, and install erp5_configurator_standard_categories where needed in tests.

*: fix trade phase duplication in erp5_simulation_test and erp5_configurator_standard_categories
We had trade phase duplication: - `trade_phase/default/*` were provided by erp5_simulation_test - `trade_phase/trade/*` are provided by erp5_configurator_standard_categories so the former was only for testing and the later were actually used in instance configured by configurator. But in some paths from configurator_standard_*template, which are also used on configurated instances, were using trade_phase/default (the one from test). Some rules were referencing these categories, but apparenlty not using them. To fix this confusion, use trade_phase/trade/* everywhere, and install erp5_configurator_standard_categories where needed in tests.
416c6212 · Jérome Perrin · d4a9d1c3 · 416c6212 · 416c6212 · 416c6212
Commit 416c6212 authored Feb 09, 2022 by Jérome Perrin
233 changed files
--- a/bt5/erp5_accounting_ui_test/TestTemplateItem/portal_components/test.erp5.testConversionInSimulation.py
+++ b/bt5/erp5_accounting_ui_test/TestTemplateItem/portal_components/test.erp5.testConversionInSimulation.py
@@ -96,9 +96,6 @@ class TestConversionInSimulation(AccountingTestCase):
    _(category_tool.incoterm, [self.cpt_incoterm])
    _(category_tool.quantity_unit,
      [self.unit_piece_quantity_unit, self.mass_quantity_unit])
-    _(category_tool.trade_phase, ['default'])
-    _(category_tool.trade_phase.default,
-      ['accounting', 'delivery', 'invoicing', 'discount', 'tax', 'payment'])
    _(category_tool.product_line, ['apparel'])
  def _solveDivergence(self, obj, prop, decision, group='line'):
@@ -201,13 +198,13 @@ class TestConversionInSimulation(AccountingTestCase):
    )
    trade_phase = self.getCategoryTool().trade_phase
    kw = dict(portal_type='Trade Model Path',
-              trade_date='trade_phase/default/order')
+              trade_date='trade_phase/trade/order')
    business_process.newContent(
      reference='default_path',
-      trade_phase_value_list=[x for x in trade_phase.default.objectValues()
+      trade_phase_value_list=[x for x in trade_phase.trade.objectValues()
                              if x.getId() != 'accounting'],
      **kw)
-    kw.update(trade_phase='default/accounting',
+    kw.update(trade_phase='trade/accounting',
              resource_value=resource,
              membership_criterion_base_category_list=(
                'destination_region',

--- a/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/collect_point.xml
+++ b/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/collect_point.xml
@@ -24,7 +24,7 @@
              <tuple>
                <string>base_application/base_amount/loyalty_program/collect_point</string>
                <string>resource/service_module/test_loyalty_collect_point</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>use/loyalty_program/collect_point</string>
              </tuple>
            </value>

--- a/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/discount.xml
+++ b/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/discount.xml
@@ -23,7 +23,7 @@
            <value>
              <tuple>
                <string>resource/service_module/test_loyalty_discount</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>base_application/base_amount/loyalty_program/discount</string>
              </tuple>
            </value>

--- a/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/using_point.xml
+++ b/bt5/erp5_advanced_ecommerce_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_reward_paypal/using_point.xml
@@ -23,7 +23,7 @@
            <value>
              <tuple>
                <string>resource/service_module/test_loyalty_using_point</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>base_application/base_amount/loyalty_program/using_point</string>
              </tuple>
            </value>

--- a/bt5/erp5_commerce_loyalty_program/PathTemplateItem/portal_rules/loyalty_transaction_rule.xml
+++ b/bt5/erp5_commerce_loyalty_program/PathTemplateItem/portal_rules/loyalty_transaction_rule.xml
@@ -64,7 +64,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/collect_point.xml
+++ b/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/collect_point.xml
@@ -24,7 +24,7 @@
              <tuple>
                <string>base_application/base_amount/loyalty_program/collect_point</string>
                <string>resource/service_module/test_loyalty_collect_point</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>use/loyalty_program/collect_point</string>
              </tuple>
            </value>

--- a/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/coupon.xml
+++ b/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/coupon.xml
@@ -23,7 +23,7 @@
            <value>
              <tuple>
                <string>resource/service_module/test_loyalty_coupon</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>base_application/base_amount/loyalty_program/coupon</string>
              </tuple>
            </value>

--- a/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/discount.xml
+++ b/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/discount.xml
@@ -23,7 +23,7 @@
            <value>
              <tuple>
                <string>resource/service_module/test_loyalty_discount</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>base_application/base_amount/loyalty_program/discount</string>
              </tuple>
            </value>

--- a/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/using_point.xml
+++ b/bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/sale_trade_condition_module/test_loyalty_program/using_point.xml
@@ -23,7 +23,7 @@
            <value>
              <tuple>
                <string>resource/service_module/test_loyalty_using_point</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>base_application/base_amount/loyalty_program/using_point</string>
              </tuple>
            </value>

--- a/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_accounting_transaction_root_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_accounting_transaction_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_payment_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_accounting_template/PathTemplateItem/portal_rules/new_payment_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/payment</string>
+                <string>trade_phase/trade/payment</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_rules/new_invoice_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_rules/new_invoice_simulation_rule.xml
@@ -64,7 +64,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule.xml
@@ -64,7 +64,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
+++ b/bt5/erp5_configurator_standard_trade_template/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/1.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/1.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/2.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/2.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/3.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/3.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/4.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/4.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/6.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/6.xml
@@ -89,7 +89,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/7.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/7.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/8.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/8.xml
@@ -79,7 +79,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/9.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/9.xml
@@ -89,7 +89,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/payment</string>
+                <string>trade_phase/trade/payment</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_accounting_transaction_root_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_accounting_transaction_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_payment_simulation_rule.xml
+++ b/bt5/erp5_demo_maxma_rule/PathTemplateItem/portal_rules/new_payment_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/payment</string>
+                <string>trade_phase/trade/payment</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/13.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/13.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
-                <string>trade_date/trade_phase/default/accounting</string>
+                <string>trade_date/trade_phase/trade/accounting</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/account.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/account.xml
@@ -78,7 +78,7 @@
              <tuple>
                <string>delivery_builder/portal_deliveries/purchase_invoice_transaction_builder</string>
                <string>delivery_builder/portal_deliveries/sale_invoice_transaction_builder</string>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
                <string>predecessor/trade_state/invoiced</string>
                <string>successor/trade_state/accounted</string>
              </tuple>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/deliver.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/deliver.xml
@@ -77,7 +77,7 @@
            <value>
              <tuple>
                <string>delivery_builder/portal_deliveries/sale_packing_list_builder</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>predecessor/trade_state/ordered</string>
                <string>successor/trade_state/delivered</string>
              </tuple>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/delivery_path.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/delivery_path.xml
@@ -69,8 +69,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
-                <string>trade_date/trade_phase/default/order</string>
+                <string>trade_date/trade_phase/trade/order</string>
                <string>end_of/day</string>
              </tuple>
            </value>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/invoice.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/invoice.xml
@@ -77,7 +77,7 @@
            <value>
              <tuple>
                <string>delivery_builder/portal_deliveries/sale_invoice_builder</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>predecessor/trade_state/delivered</string>
                <string>successor/trade_state/invoiced</string>
              </tuple>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/invoice_path.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/invoice_path.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_date/trade_phase/default/delivery</string>
+                <string>trade_date/trade_phase/trade/delivery</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/order.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/order.xml
@@ -76,7 +76,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
                <string>successor/trade_state/ordered</string>
              </tuple>
            </value>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/order_path.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/order_path.xml
@@ -50,8 +50,8 @@
            <value>
              <tuple>
                <string>incoterm/a</string>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
-                <string>trade_date/trade_phase/default/order</string>
+                <string>trade_date/trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/pay.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/business_process_module/maxma_business_process/pay.xml
@@ -77,7 +77,7 @@
            <value>
              <tuple>
                <string>delivery_builder/portal_deliveries/payment_transaction_builder</string>
-                <string>trade_phase/default/payment</string>
+                <string>trade_phase/trade/payment</string>
                <string>predecessor/trade_state/accounted</string>
                <string>successor/trade_state/paid</string>
                <string>source/account_module/bank</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/10/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/10/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/10/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/10/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/100/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/100/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/100/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/100/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/11/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/11/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/1</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/15</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/11/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/11/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/12/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/12/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/12/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/12/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/10</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/13/3/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/14/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/14/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/14/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/14/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/18/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/18/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/2</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/14</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/18/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/18/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/19/3/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/2/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/2/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/2/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/2/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/20/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/20/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/20/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/20/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/22/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/22/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/10</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/22/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/22/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/25/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/25/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/25/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/25/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/26/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/26/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/3</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/13</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/26/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/26/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/27/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/27/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/27/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/27/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/2/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/28/3/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/29/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/29/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/29/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/29/1/1/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/10</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/3/3/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/35/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/35/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/2</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/14</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/35/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/35/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/37/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/37/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/37/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/37/1/1/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/39/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/39/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/3</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/39/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/39/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/40/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/40/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/40/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/40/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/41/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/41/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/41/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/41/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/4</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/12</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/9</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1/1/1.xml
@@ -29,7 +29,7 @@
            <value>
              <tuple>
                <string>quantity_unit/unit/piece</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>source_administration/organisation_module/11</string>
                <string>destination_account/account_module/purchase</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/10</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/4</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/12</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/2</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/12</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/9</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/17</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/17</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/8</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/4</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/12</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/11</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/11</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/7</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/11</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1/1/1.xml
@@ -34,7 +34,7 @@
                <string>causality/business_process_module/maxma_business_process/invoice</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/12</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>destination/organisation_module/myorganisation</string>
                <string>destination_decision/person_module/5</string>
                <string>specialise/purchase_trade_condition_module/3</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/5</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/9</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/10</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/16</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1.xml
@@ -33,7 +33,7 @@
                <string>resource/product_module/6</string>
                <string>quantity_unit/unit/piece</string>
                <string>source_section/organisation_module/myorganisation</string>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>delivery_mode/air</string>
                <string>destination_decision/person_module/10</string>
                <string>specialise/sale_trade_condition_module/1</string>

--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1/1/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1/1/1.xml
@@ -28,7 +28,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>delivery_mode/air</string>
                <string>causality/business_process_module/maxma_business_process/invoice_path</string>
                <string>causality/business_process_module/maxma_business_process/invoice</string>

--- a/bt5/erp5_invoicing/ModuleComponentTemplateItem/portal_components/module.erp5.TestInvoiceMixin.py
+++ b/bt5/erp5_invoicing/ModuleComponentTemplateItem/portal_components/module.erp5.TestInvoiceMixin.py
@@ -158,8 +158,8 @@ class TestInvoiceMixin(TestPackingListMixin):
        business_process_id, 'Business Process',
        specialise=self.__class__.business_process)
      kw = dict(portal_type='Trade Model Path',
-                trade_phase='default/accounting',
+                trade_phase='trade/accounting',
-                trade_date='trade_phase/default/invoicing',
+                trade_date='trade_phase/trade/invoicing',
                membership_criterion_base_category_list=('destination_region',
                                                         'product_line'),
                membership_criterion_category=(

--- a/bt5/erp5_invoicing/TestTemplateItem/portal_components/test.erp5.testRule.py
+++ b/bt5/erp5_invoicing/TestTemplateItem/portal_components/test.erp5.testRule.py
@@ -303,11 +303,11 @@ return context.generatePredicate(
    delivery_rule.validate()
    self.tic()
    # Now since the rule has a trade_phase
-    self.assertEqual(delivery_rule.getTradePhase(), 'default/delivery')
+    self.assertEqual(delivery_rule.getTradePhase(), 'trade/delivery')
    # ...then it won't match the Simulation Movement
    self.assertEqual(len(rule_tool.searchRuleList(self.sm)), 0)
    # unless it gets a trade_phase itself
-    self.sm.setTradePhase('default/delivery')
+    self.sm.setTradePhase('trade/delivery')
    self.tic()
    self.assertEqual(len(rule_tool.searchRuleList(self.sm)), 1)
    # But if the rule itself has no trade_phase...
@@ -336,7 +336,7 @@ return context.generatePredicate(
    self.tic()
    # Now since the rule has a trade_phase
    trade_phase_list = delivery_rule.getTradePhaseList()
-    self.assertEqual(trade_phase_list, ['default/delivery'])
+    self.assertEqual(trade_phase_list, ['trade/delivery'])
    # then it should be possible to find it by passing this trade_phase
    # as an additional catalog keyword
    kw = {'trade_phase_relative_url':
@@ -344,7 +344,7 @@ return context.generatePredicate(
    # XXX-Leo: Fugly catalog syntax for category search above.
    self.assertEqual(len(rule_tool.searchRuleList(self.sm, **kw)), 1)
    # and also not to match it if we pass a different trade_phase
-    kw['trade_phase_relative_url'] = ['trade_phase/' + 'default/order']
+    kw['trade_phase_relative_url'] = ['trade_phase/trade/order']
    self.assertEqual(len(rule_tool.searchRuleList(self.sm, **kw)), 0)
    # but match it again if we pass an empty list for trade_phase
    # (with a warning in the log about discarding empty values)

--- a/bt5/erp5_mrp/TestTemplateItem/portal_components/test.erp5.testMRP.py
+++ b/bt5/erp5_mrp/TestTemplateItem/portal_components/test.erp5.testMRP.py
@@ -242,12 +242,12 @@ class TestMRPMixin(TestBPMMixin):
    sourcing_builder = 'portal_deliveries/transformation_sourcing_internal_packing_list_builder'
    completed = 'delivered', 'started', 'stopped'
    phase_list = [
-      ('default/order', None, ('confirmed',)),
+      ('trade/order', None, ('confirmed',)),
      ('manufacturing/order', manufacturing_order_builder, ('confirmed',)),
      ('mrp/manufacturing_step_0', manufacturing_execution_builder, completed),
      ('mrp/sourcing_0', sourcing_builder, completed),
      ('mrp/manufacturing_step_1', manufacturing_execution_builder, completed),
-      ('default/delivery', production_packing_list_builder, completed)
+      ('trade/delivery', production_packing_list_builder, completed)
    ]
    predecessor = None
    for i, (phase, builder, completed) in enumerate(phase_list):

--- a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
+++ b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
@@ -3031,8 +3031,8 @@ class TestPayroll(TestPayrollMixin):
    self.business_process = self.createBusinessProcess()
    kw = dict(business_process=self.business_process,
-              trade_phase='default/accounting',
+              trade_phase='trade/accounting',
-              trade_date='trade_phase/default/invoicing',
+              trade_date='trade_phase/trade/invoicing',
              membership_criterion_base_category_list=['contribution_share',
                                                       'product_line'],
              criterion_property_dict={'portal_type': 'Simulation Movement'})
@@ -3087,7 +3087,7 @@ class TestPayroll(TestPayrollMixin):
    self.createBusinessLink(
      self.business_process,
      successor_value=invoiced,
-      trade_phase='default/accounting',
+      trade_phase='trade/accounting',
      completed_state_list=completed_state_list,
      frozen_state_list=frozen_state_list,
      delivery_builder_list=('portal_deliveries/pay_sheet_transaction_builder',))

--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testBPMCore.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testBPMCore.py
@@ -72,9 +72,6 @@ class TestBPMMixin(ERP5TypeTestCase):
    self.createCategoriesInCategory(category_tool.use,
        self.normal_resource_use_category_list + \
            self.invoicing_resource_use_category_list)
-    self.createCategoriesInCategory(category_tool.trade_phase, ['default',])
-    self.createCategoriesInCategory(category_tool.trade_phase.default,
-        ['accounting', 'delivery', 'invoicing', 'discount', 'tax', 'payment'])
    self.createCategoriesInCategory(category_tool.trade_state,
        ['ordered', 'invoiced', 'delivered', 'taxed',
         'state_a', 'state_b', 'state_c', 'state_d', 'state_e'])
@@ -95,26 +92,26 @@ class TestBPMMixin(ERP5TypeTestCase):
    if create_order_to_invoice_path:
      self.createTradeModelPath(self.business_process,
        reference='order_path',
-        trade_phase_list=('default/order',))
+        trade_phase_list=('trade/order',))
      self.createTradeModelPath(self.business_process,
        reference='delivery_path',
-        trade_phase_list=('default/delivery',),
+        trade_phase_list=('trade/delivery',),
-        trade_date='trade_phase/default/order')
+        trade_date='trade_phase/trade/order')
      self.createTradeModelPath(self.business_process,
        reference='invoice_path',
-        trade_phase_list=('default/invoicing',),
+        trade_phase_list=('trade/invoicing',),
-        trade_date='trade_phase/default/delivery')
+        trade_date='trade_phase/trade/delivery')
    self.createTradeModelPath(business_process,
      reference='default_path',
-      trade_phase_list=('default/discount', 'default/tax'),
+      trade_phase_list=('trade/discount', 'trade/tax'),
-      trade_date='trade_phase/default/invoicing')
+      trade_date='trade_phase/trade/invoicing')
    # A trade model path already exist for root simulation movements
    # (Accounting Transaction Root Simulation Rule).
    # The ones we are creating are for Invoice Transaction Simulation Rule
    # so we add a test on the portal type of the input movement.
    kw = dict(business_process=business_process,
-              trade_phase='default/accounting',
+              trade_phase='trade/accounting',
-              trade_date='trade_phase/default/invoicing',
+              trade_date='trade_phase/trade/invoicing',
              membership_criterion_base_category='resource_use',
              criterion_property_dict={'portal_type': 'Simulation Movement'})
    self.createTradeModelPath(reference='acounting_tax1',
@@ -260,19 +257,19 @@ class TestBPMDummyDeliveryMovementMixin(TestBPMMixin):
    # proper state
    self.order_link = self.createBusinessLink(business_process,
        successor_value = ordered,
-        trade_phase='default/order',
+        trade_phase='trade/order',
        completed_state_list = self.completed_state_list,
        frozen_state_list = self.frozen_state_list)
    self.delivery_link = self.createBusinessLink(business_process,
        predecessor_value = ordered, successor_value = delivered,
-        trade_phase='default/delivery',
+        trade_phase='trade/delivery',
        completed_state_list = self.completed_state_list,
        frozen_state_list = self.frozen_state_list)
    self.invoice_link = self.createBusinessLink(business_process,
        predecessor_value = delivered, successor_value = invoiced,
-        trade_phase='default/invoicing')
+        trade_phase='trade/invoicing')
    self.tic()
  def constructSimulationTreeAndDeliveries(self, simulation_depth=None,
@@ -308,7 +305,7 @@ class TestBPMDummyDeliveryMovementMixin(TestBPMMixin):
        applied_rule.newContent(
        portal_type = 'Simulation Movement',
        delivery_value = order_line,
-        trade_phase='default/order',
+        trade_phase='trade/order',
        causality_value_list=[self.order_link, self.order_path],
        **simulation_movement_kw
        ))
@@ -322,7 +319,7 @@ class TestBPMDummyDeliveryMovementMixin(TestBPMMixin):
        document = setTestClassProperty(prefix, 'delivery_simulation_movement',
          document.newContent(
          portal_type='Simulation Movement',
-          trade_phase='default/delivery',
+          trade_phase='trade/delivery',
          causality_value_list=[self.delivery_link, self.delivery_path],
          **simulation_movement_kw))
@@ -336,7 +333,7 @@ class TestBPMDummyDeliveryMovementMixin(TestBPMMixin):
                        'invoicing_simulation_movement',
              document.newContent(
              portal_type='Simulation Movement',
-              trade_phase='default/invoicing',
+              trade_phase='trade/invoicing',
              causality_value_list=[self.invoice_link, self.invoice_path],
              **simulation_movement_kw))
@@ -352,33 +349,33 @@ class TestBPMImplementation(TestBPMDummyDeliveryMovementMixin):
    accounting_business_link = business_process.newContent(
        portal_type=self.business_link_portal_type,
-        trade_phase='default/accounting')
+        trade_phase='trade/accounting')
    delivery_business_link = business_process.newContent(
        portal_type=self.business_link_portal_type,
-        trade_phase='default/delivery')
+        trade_phase='trade/delivery')
    accounting_delivery_business_link = business_process.newContent(
        portal_type=self.business_link_portal_type,
-        trade_phase=('default/accounting', 'default/delivery'))
+        trade_phase=('trade/accounting', 'trade/delivery'))
    self.tic()
    self.assertSameSet(
      (accounting_business_link, accounting_delivery_business_link),
-      business_process.getBusinessLinkValueList(trade_phase='default/accounting')
+      business_process.getBusinessLinkValueList(trade_phase='trade/accounting')
    )
    self.assertSameSet(
      (delivery_business_link, accounting_delivery_business_link),
-      business_process.getBusinessLinkValueList(trade_phase='default/delivery')
+      business_process.getBusinessLinkValueList(trade_phase='trade/delivery')
    )
    self.assertSameSet(
      (accounting_delivery_business_link, delivery_business_link,
        accounting_business_link),
-      business_process.getBusinessLinkValueList(trade_phase=('default/delivery',
+      business_process.getBusinessLinkValueList(trade_phase=('trade/delivery',
-        'default/accounting'))
+        'trade/accounting'))
    )
  def test_BusinessLinkStandardCategoryAccessProvider(self):
@@ -482,13 +479,13 @@ class TestBPMImplementation(TestBPMDummyDeliveryMovementMixin):
    business_process = self.createBusinessProcess()
    business_link_order = self.createBusinessLink(business_process,
                                 title='order', id='order',
-                                 trade_phase='default/order')
+                                 trade_phase='trade/order')
    business_link_deliver = self.createBusinessLink(business_process,
                                 title='deliver', id='deliver',
-                                 trade_phase='default/delivery')
+                                 trade_phase='trade/delivery')
    business_link_invoice = self.createBusinessLink(business_process,
                                 title='invoice', id='invoice',
-                                 trade_phase='default/invoicing')
+                                 trade_phase='trade/invoicing')
    trade_state = category_tool.trade_state
    business_link_order.setSuccessorValue(trade_state.ordered)
    business_link_deliver.setPredecessorValue(trade_state.ordered)
@@ -496,7 +493,7 @@ class TestBPMImplementation(TestBPMDummyDeliveryMovementMixin):
    business_link_invoice.setPredecessorValue(trade_state.delivered)
    business_link_invoice.setSuccessorValue(trade_state.invoiced)
-    trade_phase = category_tool.trade_phase.default
+    trade_phase = category_tool.trade_phase.trade
    self.assertEqual([trade_phase.delivery,
                       trade_phase.invoicing],
@@ -519,19 +516,19 @@ class TestBPMImplementation(TestBPMDummyDeliveryMovementMixin):
    business_process = self.createBusinessProcess()
    business_link_order = self.createBusinessLink(business_process,
                                 title='order', id='order',
-                                 trade_phase='default/order')
+                                 trade_phase='trade/order')
    business_link_deliver = self.createBusinessLink(business_process,
                                 title='deliver', id='deliver',
-                                 trade_phase='default/delivery')
+                                 trade_phase='trade/delivery')
    business_link_invoice = self.createBusinessLink(business_process,
                                 title='invoice', id='invoice',
-                                 trade_phase='default/invoicing')
+                                 trade_phase='trade/invoicing')
    business_link_tax = self.createBusinessLink(business_process,
                                 title='tax', id='tax',
-                                 trade_phase='default/tax')
+                                 trade_phase='trade/tax')
    business_link_account = self.createBusinessLink(business_process,
                                 title='accounting', id='account',
-                                 trade_phase='default/accounting')
+                                 trade_phase='trade/accounting')
    trade_state = category_tool.trade_state
    business_link_order.setSuccessorValue(trade_state.ordered)
@@ -544,7 +541,7 @@ class TestBPMImplementation(TestBPMDummyDeliveryMovementMixin):
    business_link_account.setPredecessorValue(trade_state.invoiced)
    business_link_account.setSuccessorValue(trade_state.accounted)
-    trade_phase = category_tool.trade_phase.default
+    trade_phase = category_tool.trade_phase.trade
    def _u(trade_phase):
      return trade_phase.getCategoryRelativeUrl()

--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testComplexTradeModelLineUseCase.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testComplexTradeModelLineUseCase.py
@@ -117,7 +117,7 @@ class TestComplexTradeModelLineUseCase(TestTradeModelLineMixin):
           reference='DISCOUNT_AMOUNT',
           resource_value=self.service_discount,
           price=1,
-           trade_phase='default/invoicing',
+           trade_phase='trade/invoicing',
           target_delivery=True,
           base_application_list=('base_amount/discount_amount_of_vat_taxable',
                                  'base_amount/discount_amount_of_non_vat_taxable'),
@@ -126,7 +126,7 @@ class TestComplexTradeModelLineUseCase(TestTradeModelLineMixin):
           reference='VAT_AMOUNT',
           resource_value=self.service_vat,
           price=0.05,
-           trade_phase='default/invoicing',
+           trade_phase='trade/invoicing',
           target_delivery=True,
           base_application_list=('base_amount/discount_amount_of_vat_taxable',
                                  'base_amount/vat_taxable'),

--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
@@ -134,7 +134,7 @@ class TestTradeModelLineMixin(TestBPMMixin, UserDict):
    if self.business_link_portal_type is not None:
      business_link_list = [
        dict(reference='discount',
-             trade_phase='default/discount',
+             trade_phase='trade/discount',
             predecessor='trade_state/invoiced',
             # should successor be trade_state/discounted? There is no
             # such trade_state category
@@ -143,7 +143,7 @@ class TestTradeModelLineMixin(TestBPMMixin, UserDict):
                               'portal_deliveries/sale_invoice_transaction_trade_model_builder'],
        ),
        dict(reference='tax',
-             trade_phase='default/tax',
+             trade_phase='trade/tax',
             predecessor='trade_state/invoiced',
             # should successor be trade_state/taxed? There IS such a
             # trade_state category, but the rule that wants to match
@@ -508,12 +508,12 @@ class TestTradeModelLine(TestTradeModelLineMixin):
      dict(price=self.default_discount_ratio,
           base_application='base_amount/discount',
           base_contribution='base_amount/tax',
-           trade_phase='default/discount',
+           trade_phase='trade/discount',
           resource_value=self.createServiceDiscount(),
           reference='discount'),
      dict(price=self.default_tax_ratio,
           base_application='base_amount/tax',
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           resource_value=self.createServiceTax(),
           reference='tax'),
      ))
@@ -725,30 +725,30 @@ class TestTradeModelLine(TestTradeModelLineMixin):
      dict(price=0.2,
           base_application='base_amount/tax',
           base_contribution='base_amount/total_tax',
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           resource_value=service_tax,
           reference='service_tax'),
      dict(price=0.32,
           base_application='base_amount/discount',
           base_contribution='base_amount/total_discount',
-           trade_phase='default/discount',
+           trade_phase='trade/discount',
           resource_value=service_discount,
           reference='total_dicount_2'),
      dict(price=0.2,
           base_application='base_amount/tax',
           base_contribution='base_amount/total_tax',
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           resource_value=service_tax,
           reference='service_tax_2'),
      dict(price=0.12,
           base_application='base_amount/total_tax',
           base_contribution='base_amount/total_discount',
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           resource_value=service_tax,
           reference='tax_3'),
      dict(price=0.8,
           base_application='base_amount/total_discount',
-           trade_phase='default/discount',
+           trade_phase='trade/discount',
           resource_value=service_discount,
           reference='total_discount'),
      ]
@@ -965,7 +965,7 @@ return lambda *args, **kw: 1""")
      dict(reference='VAT',
           price=.15,
           resource_value=tax,
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           use='tax',
           base_application='base_amount/tax'),
      ))
@@ -1087,7 +1087,7 @@ return lambda *args, **kw: 1""")
      dict(reference='VAT',
           price=.15,
           resource_value=tax,
-           trade_phase='default/tax',
+           trade_phase='trade/tax',
           base_application='base_amount/tax'),
      ))
    source = self.createNode()

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account.xml
@@ -78,7 +78,7 @@
              <tuple>
                <string>delivery_builder/portal_deliveries/purchase_invoice_transaction_builder</string>
                <string>delivery_builder/portal_deliveries/sale_invoice_transaction_builder</string>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
                <string>predecessor/trade_state/invoiced</string>
                <string>successor/trade_state/accounted</string>
              </tuple>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account_credit_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account_credit_path.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
-                <string>trade_date/trade_phase/default/invoicing</string>
+                <string>trade_date/trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account_debit_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/account_debit_path.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/accounting</string>
+                <string>trade_phase/trade/accounting</string>
-                <string>trade_date/trade_phase/default/invoicing</string>
+                <string>trade_date/trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/deliver.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/deliver.xml
@@ -76,7 +76,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
                <string>predecessor/trade_state/ordered</string>
                <string>successor/trade_state/delivered</string>
                <string>delivery_builder/portal_deliveries/internal_packing_list_builder</string>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/delivery_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/delivery_path.xml
@@ -69,8 +69,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
-                <string>trade_date/trade_phase/default/order</string>
+                <string>trade_date/trade_phase/trade/order</string>
                <string>end_of/day</string>
              </tuple>
            </value>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/invoice.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/invoice.xml
@@ -76,7 +76,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
                <string>predecessor/trade_state/delivered</string>
                <string>successor/trade_state/invoiced</string>
                <string>delivery_builder/portal_deliveries/purchase_invoice_builder</string>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/invoice_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/invoice_path.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_date/trade_phase/default/delivery</string>
+                <string>trade_date/trade_phase/trade/delivery</string>
-                <string>trade_phase/default/invoicing</string>
+                <string>trade_phase/trade/invoicing</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/order.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/order.xml
@@ -76,7 +76,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
                <string>successor/trade_state/ordered</string>
              </tuple>
            </value>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/order_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/order_path.xml
@@ -49,8 +49,8 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
-                <string>trade_date/trade_phase/default/order</string>
+                <string>trade_date/trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/pay.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_business_process/pay.xml
@@ -77,7 +77,7 @@
            <value>
              <tuple>
                <string>delivery_builder/portal_deliveries/payment_transaction_builder</string>
-                <string>trade_phase/default/payment</string>
+                <string>trade_phase/trade/payment</string>
                <string>predecessor/trade_state/accounted</string>
                <string>successor/trade_state/paid</string>
                <string>source/account_module/bank</string>

--- a/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_task_business_process/delivery_path.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/business_process_module/erp5_default_task_business_process/delivery_path.xml
@@ -22,7 +22,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default.xml
@@ -59,6 +59,23 @@
              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
            </value>
        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>_mt_index</string> </key>
            <value>
@@ -71,17 +88,44 @@
              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
            </value>
        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Different phases used in for trade</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
-            <value> <string>default</string> </value>
+            <value> <string>trade</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Category</string> </value>
        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>1</string> </value>
+        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>default</string> </value>
+            <value> <string>Trade</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/accounting.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/accounting.xml
@@ -53,6 +53,46 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Accounting of the invoice</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>accounting</string> </value>
@@ -61,9 +101,13 @@
            <key> <string>portal_type</string> </key>
            <value> <string>Category</string> </value>
        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>4</string> </value>
+        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>accounting</string> </value>
+            <value> <string>Accounting</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/delivery.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/delivery.xml
@@ -53,6 +53,46 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Delivery of goods or services</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>delivery</string> </value>
@@ -61,9 +101,13 @@
            <key> <string>portal_type</string> </key>
            <value> <string>Category</string> </value>
        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>2</string> </value>
+        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>delivery</string> </value>
+            <value> <string>Delivery</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/discount.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/discount.xml
@@ -53,6 +53,12 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>discount</string> </value>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/invoicing.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/invoicing.xml
@@ -53,6 +53,46 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Invoicing of what has been delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>invoicing</string> </value>
@@ -61,9 +101,13 @@
            <key> <string>portal_type</string> </key>
            <value> <string>Category</string> </value>
        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>3</string> </value>
+        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>invoicing</string> </value>
+            <value> <string>Invoicing</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/order.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/order.xml
@@ -53,6 +53,16 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Order of goods or services</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>order</string> </value>
@@ -63,7 +73,7 @@
        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>order</string> </value>
+            <value> <string>Order</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/payment.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/payment.xml
@@ -53,6 +53,46 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Payments of the debt</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>payment</string> </value>
@@ -61,9 +101,13 @@
            <key> <string>portal_type</string> </key>
            <value> <string>Category</string> </value>
        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>5</string> </value>
+        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>payment</string> </value>
+            <value> <string>Payment</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/trade/prepayment.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/trade/prepayment.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>sort_index</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Prepayment</string> </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="DateTime" module="DateTime.DateTime"/>
+                </klass>
+                <tuple>
+                  <none/>
+                </tuple>
+                <state>
+                  <tuple>
+                    <float>1263423600.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>prepayment</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>sort_index</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Prepayment</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/tax.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default/tax.xml
@@ -53,6 +53,12 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>tax</string> </value>
@@ -63,7 +69,7 @@
        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>tax</string> </value>
+            <value> <string>Tax</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_simulation_test/bt/template_path_list
+++ b/bt5/erp5_simulation_test/bt/template_path_list
@@ -4,6 +4,6 @@ business_process_module/erp5_default_task_business_process
 business_process_module/erp5_default_task_business_process/**
 portal_alarms/invoice_builder_alarm
 portal_alarms/packing_list_builder_alarm
-portal_categories/trade_phase/default
+portal_categories/trade_phase/trade
-portal_categories/trade_phase/default/**
+portal_categories/trade_phase/trade/**
 portal_categories/trade_state/**
\ No newline at end of file
--- a/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
+++ b/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
+++ b/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_delivery_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/delivery</string>
+                <string>trade_phase/trade/delivery</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
+++ b/bt5/erp5_simulation_test_trade_template/PathTemplateItem/portal_rules/new_order_root_simulation_rule.xml
@@ -40,7 +40,7 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>trade_phase/default/order</string>
+                <string>trade_phase/trade/order</string>
              </tuple>
            </value>
        </item>