*: 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
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/42/3.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/43/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/44/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/45/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/46/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/47/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/48/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/49/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/5/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/50/3.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/51/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/54/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/55/3.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/58/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/60/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/61/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/65/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/69/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/71/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/72/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/74/3.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/77/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/78/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/79/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/80/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/81/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/84/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/87/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/2.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/88/3.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/9/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/90/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/91/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/92/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/93/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/94/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/95/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/98/1.xml
--- 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
--- a/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1.xml
+++ b/bt5/erp5_demo_maxma_sample/PathTemplateItem/portal_simulation/99/1.xml
--- 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
--- a/bt5/erp5_invoicing/ModuleComponentTemplateItem/portal_components/module.erp5.TestInvoiceMixin.py
+++ b/bt5/erp5_invoicing/ModuleComponentTemplateItem/portal_components/module.erp5.TestInvoiceMixin.py
--- a/bt5/erp5_invoicing/TestTemplateItem/portal_components/test.erp5.testRule.py
+++ b/bt5/erp5_invoicing/TestTemplateItem/portal_components/test.erp5.testRule.py
--- a/bt5/erp5_mrp/TestTemplateItem/portal_components/test.erp5.testMRP.py
+++ b/bt5/erp5_mrp/TestTemplateItem/portal_components/test.erp5.testMRP.py
--- a/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
+++ b/bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testBPMCore.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testBPMCore.py
--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testComplexTradeModelLineUseCase.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testComplexTradeModelLineUseCase.py
--- a/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
+++ b/bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default.xml
+++ b/bt5/erp5_simulation_test/PathTemplateItem/portal_categories/trade_phase/default.xml
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/bt5/erp5_simulation_test/bt/template_path_list
+++ b/bt5/erp5_simulation_test/bt/template_path_list
--- 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
--- 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
--- 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