diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_account_statement.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_account_statement.zpt
index 0b4c5ee2974d662dd7288a9d88b9c9265d286ee1..28586669435fbadd44af3d2ffbe26048df933568 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_account_statement.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_account_statement.zpt
@@ -9,14 +9,14 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=account-statement&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=account-statement&report_style=Hal;
now python:DateTime();
today python:DateTime(now.year(), now.month(), now.day());
tomorrow python:today + 1;
yesterday python:today - 1;
offset python:0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.day())"></td><td>day</td></tr>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>
<tr><td>store</td><td tal:content="python: now.year()"></td><td>year</td></tr>
@@ -97,7 +97,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:100;
credit_price string:0;
running_total_price string:100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
@@ -108,7 +108,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:200;
running_total_price string:-100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[3];
@@ -118,7 +118,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:300;
credit_price string:0;
running_total_price string:200">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[4];
@@ -128,7 +128,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:400;
credit_price string:0;
running_total_price string:600">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[5];
@@ -138,7 +138,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:500;
credit_price string:0;
running_total_price string:1100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[6];
@@ -148,13 +148,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:600;
credit_price string:0;
running_total_price string:1700">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:1900;
credit_price string:200">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
</tbody>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_aged_balance.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_aged_balance.zpt
index 24e9988d71683e2693270606b6a7b0b7d01bfe2c..d8ace14c1dacf9c57e75a668cdf1f2f1fd7f88b1 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_aged_balance.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_aged_balance.zpt
@@ -9,12 +9,12 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=aged-balance&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=aged-balance&report_style=Hal;
now python:DateTime();
last_month python:DateTime(now.year(), now.month(), 1) - 1;
offset python:0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>
<tr><td>store</td><td tal:content="python: now.year()"></td><td>year</td></tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_balance_sheet.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_balance_sheet.zpt
index a07c3ce49b655641cb8a2619fe7346cab04ce1b3..a6f4dced7bc561aab5de794ebda63c2d6a42d899 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_balance_sheet.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_balance_sheet.zpt
@@ -9,11 +9,11 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=balance-sheet&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=balance-sheet&report_style=Hal;
offset python:0;
now python:DateTime()">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.day())"></td><td>day</td></tr>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_general_ledger.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_general_ledger.zpt
index 82bfc2e2de99e58204f85e319cd74b010593d2ba..a2c91c7e935745e195c5b0cdd32dddd30bc2eb22 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_general_ledger.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_general_ledger.zpt
@@ -12,14 +12,14 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=general-ledger&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=general-ledger&report_style=Hal;
now python:DateTime();
today python:DateTime(now.year(), now.month(), now.day());
tomorrow python:today + 1;
yesterday python:today - 1;
offset python:0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.day())"></td><td>day</td></tr>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>
@@ -98,7 +98,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:300;
running_total_price string:-300">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
@@ -109,7 +109,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:400;
running_total_price string:-700">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[3];
@@ -119,7 +119,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:500;
running_total_price string:-1200">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[4];
@@ -129,7 +129,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:600;
running_total_price string:-1800">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[5];
@@ -139,13 +139,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:800;
running_total_price string:-2600">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:0;
credit_price string:2600">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<!-- 2. report section is Payable - Client 1 -->
@@ -169,7 +169,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:100;
running_total_price string:-100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
@@ -179,13 +179,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:200;
credit_price string:0;
running_total_price string:100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:200;
credit_price string:100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<!-- 3. report section is A-REC - Receivable (Client 1) -->
@@ -208,7 +208,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:100;
credit_price string:0;
running_total_price string:100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
@@ -218,7 +218,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:0;
credit_price string:200;
running_total_price string:-100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[3];
@@ -228,7 +228,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:300;
credit_price string:0;
running_total_price string:200">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[4];
@@ -238,7 +238,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:600;
credit_price string:0;
running_total_price string:800">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[5];
@@ -248,13 +248,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:800;
credit_price string:0;
running_total_price string:1600">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:1800;
credit_price string:200">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<!-- 4. report section is A-REC - Receivable (Client 2) -->
@@ -277,13 +277,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:400;
credit_price string:0;
running_total_price string:400">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:400;
credit_price string:0">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<!-- 5. report section is A-REC - Receivable (John Smith) -->
@@ -306,13 +306,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:500;
credit_price string:0;
running_total_price string:500">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:500;
credit_price string:0">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_table" />
</tal:block>
<!-- 5. report section is Total -->
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
index 64285ce16295068ce8c67b597320e941563aaa31..30972ac4ff05b2b0e9f83037aceb9bd39f2bfee6 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
@@ -6,7 +6,7 @@
<tr><td rowspan="1" colspan="4">
Filtering Grouping Dialog by section category
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
<!-- Setup {{{ -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForAccountingRenderjsUi/macros/init"/>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
index 5a1453020ba9f5c8617bc841d8c91b3029ea7d37..cb04ab155c2c0f4a7320767bad3d3cdd386d63bc 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
@@ -6,7 +6,7 @@
<tr><td rowspan="1" colspan="4">
Using Ledger in Grouping Dialog
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
<!-- Setup {{{ -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForAccountingRenderjsUi/macros/init"/>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
index 335ff11623126ca58089585f4575757df342b4a9..8b37d0eb8407fbc237cbe399cb663e1c5db96ebe 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
@@ -6,7 +6,7 @@
<tr><td rowspan="1" colspan="4">
Grouping from account transaction view
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForAccountingRenderjsUi/macros/init"/>
@@ -128,7 +128,7 @@ Grouping from account transaction view
<!-- mark the module as changed, reindex and come back to the account -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
index 846b92fa47ec83a2cfa48b3adcb06383a0163bb6..df9ef979f881a4264739be23f9562b600ab5bc28 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
@@ -6,7 +6,7 @@
<tr><td rowspan="1" colspan="4">
Grouping from entity transaction view
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForAccountingRenderjsUi/macros/init"/>
@@ -95,7 +95,7 @@ Grouping from entity transaction view
<!-- mark the module as changed, reindex and come back to the entity -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_journal.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_journal.zpt
index 0dfbf852b9893b02b7c26d06b3d88873d159ee99..50c4cfdaed0a89fefaddd70522254b3a2e4273b0 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_journal.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_journal.zpt
@@ -9,10 +9,10 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=journal&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=journal&report_style=Hal;
now python: DateTime()">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td>
<td>${base_url}/web_site_module/renderjs_runner</td>
<td>renderjs_url</td></tr>
@@ -93,7 +93,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 1;
debit string:119.60;
credit string:0">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
specific_reference string:;
@@ -103,7 +103,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 1;
debit string:0,
credit string:19.60">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[3];
@@ -114,7 +114,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 1;
debit string:0;
credit string:100">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<!-- Second Transaction -->
@@ -126,7 +126,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 2;
debit string:239.20;
credit string:0">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[5];
specific_reference string:;
@@ -136,7 +136,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 2;
debit string:0;
credit string:39.20">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[6];
specific_reference string:;
@@ -146,7 +146,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:Client 2;
debit string:0;
credit string:200">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<!-- Third Transaction -->
@@ -158,7 +158,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:John Smith;
debit string:358.80;
credit string:0">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[8];
specific_reference string:;
@@ -168,7 +168,7 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:John Smith;
debit string:0;
credit string:58.80">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[9];
specific_reference string:;
@@ -178,13 +178,13 @@ Copy of <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/tes
mirror_section_title string:John Smith;
debit string:0;
credit string:300">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
<!-- Stats line -->
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit string:717.60;
credit string:717.60">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_transactions_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_transactions_table" />
</tal:block>
</tbody>
</table>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_profit_and_loss.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_profit_and_loss.zpt
index 40f50375dcf371ad65ffc2ea584f841f7189a7c4..7ba02db9de640fda882a1148108d3951dee65823 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_profit_and_loss.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_profit_and_loss.zpt
@@ -9,11 +9,11 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=profit-and-loss&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=profit-and-loss&report_style=Hal;
offset python:0;
now python:DateTime()">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.day())"></td><td>day</td></tr>
<tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_restricted_skin_selection.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_restricted_skin_selection.zpt
index 5247333ed2abbcd58f2c18c47cced427be4d4ce9..fee93e5d05d489e843788c12d3f30d10baba90e5 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_restricted_skin_selection.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_restricted_skin_selection.zpt
@@ -10,9 +10,9 @@ Check that use gets notified if they are using wrong 'Report Style' (UI) Prefere
<!-- Set Report Style to not-allowed value 'View' -->
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=journal&report_style=View;">
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=journal&report_style=View;">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td>
<td>${base_url}/web_site_module/renderjs_runner</td>
<td>renderjs_url</td></tr>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_third_parties.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_third_parties.zpt
index 4bacb0404f3702cb1c94b4e61235cbf387c946c4..fe0b3be4c438d344f9cd39f4a6cf70d0ff27e73a 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_third_parties.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_third_parties.zpt
@@ -9,11 +9,11 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=other-parties-ledger&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=other-parties-ledger&report_style=Hal;
offset python:0;
now python:DateTime()">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>open</td>
<td>${base_url}/portal_caches/manage_clearAllCache</td><td></td></tr>
@@ -94,7 +94,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:100;
credit_price string:0;
running_total_price string:100">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_ledger_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_ledger_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
@@ -108,13 +108,13 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
debit_price string:200;
credit_price string:0;
running_total_price string:300">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_ledger_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_ledger_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tfoot/tr[1];
debit_price string:300;
credit_price string:0">
-<tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_accounts_ledger_table" />
+<tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_accounts_ledger_table" />
</tal:block>
</tbody>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_trial_balance.zpt b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_trial_balance.zpt
index 3e3df91ab28400930a27096479eb21070e591944..84007b971b321759724ece7f59fd51b4fb8fbee9 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_trial_balance.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_trial_balance.zpt
@@ -9,10 +9,10 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
</thead>
<tbody
- tal:define="init_method string:AccountingZuite_initializeAccountingTransactionReportTest?report_name=trial-balance&report_style=Hal;
+ tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionReportTest?report_name=trial-balance&report_style=Hal;
now python: DateTime()">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr><td>store</td>
<td>${base_url}/web_site_module/renderjs_runner</td>
<td>renderjs_url</td></tr>
@@ -93,37 +93,37 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
final_balance string:-3300;
final_credit_balance string:3300;
final_balance_if_credit string:3300">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[2];
node_id string:A-COLLECTED-VAT;
node_title string:Collected VAT 10%">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[3];
node_id string:A-EQUITY;
node_title string:Equity">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[4];
node_id string:A-FIX-ASSETS;
node_title string:Fixed Assets">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[5];
node_id string:A-GP;
node_title string:Goods Purchase">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[6];
node_id string:A-GS;
node_title string:Goods Sales">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[7];
@@ -135,7 +135,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
final_debit_balance string:200;
final_credit_balance string:100;
final_balance_if_debit string:100">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[8];
@@ -147,19 +147,19 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
final_debit_balance string:3400;
final_credit_balance string:200;
final_balance_if_debit string:3200">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table" />
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table" />
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[9];
node_title string:Refundable VAT 10%;
node_id string:A-REF-VAT">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table"></tal:block>
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table"></tal:block>
</tal:block>
<tal:block tal:define="row_selector string:$${table}/tbody/tr[10];
node_title string:Stocks;
node_id string:A-STOCK">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table"></tal:block>
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table"></tal:block>
</tal:block>
<!-- Stats line -->
@@ -170,7 +170,7 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
final_credit_balance string:3600;
final_balance_if_debit string:3300;
final_balance_if_credit string:3300">
- <tal:block metal:use-macro="here/AccountingZuite_reportMacros/macros/check_row_in_balance_table"></tal:block>
+ <tal:block metal:use-macro="here/Zuite_viewAccountingTestReportMacros/macros/check_row_in_balance_table"></tal:block>
</tal:block>
</tbody>
diff --git a/bt5/erp5_accounting_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_renderjs_ui_test/Zuite_CommonTemplateForAccountingRenderjsUi.zpt b/bt5/erp5_accounting_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_renderjs_ui_test/Zuite_CommonTemplateForAccountingRenderjsUi.zpt
index dd95285a4f1f90b6d415a3ed8cfdf91122243b81..727ff15ddfe29e29761e9b69a602f75cd9531d9e 100644
--- a/bt5/erp5_accounting_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_renderjs_ui_test/Zuite_CommonTemplateForAccountingRenderjsUi.zpt
+++ b/bt5/erp5_accounting_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_renderjs_ui_test/Zuite_CommonTemplateForAccountingRenderjsUi.zpt
@@ -5,7 +5,7 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_reset</td>
+ <td>${base_url}/ERP5Site_resetConfigurationForAccountingTest</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.zpt
index 389939324b1297804beef1f355eda1e7746b9316..2fa31481529edbfe86924cda894d83d8f41f81fa 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.zpt
@@ -7,13 +7,13 @@
Test for Creating Reversal Transaction for an Accounting Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal_with_cancellation.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal_with_cancellation.html.zpt
index 138ffb90480662c17ff01f3328abbed268cc42dd..5ff3abc839386f4c96daeba2beab932766ae446b 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal_with_cancellation.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal_with_cancellation.html.zpt
@@ -7,13 +7,13 @@
Test for Creating Reversal Transaction for an Accounting Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.zpt
index 2a71b1b099dc0ccf6f2168c11e485a649d0f4ac9..da1b085c204e53d0d76dbf6eeb071db741b45977 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.zpt
@@ -7,13 +7,13 @@
Test Simple view of an Accounting Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input_invalidated_accounts.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input_invalidated_accounts.html.zpt
index d79e91505e087110226358f47f536e27290c5259..ec407cb891040433f4e01d451e94d0484a13c9ff 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input_invalidated_accounts.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input_invalidated_accounts.html.zpt
@@ -7,13 +7,13 @@
Invalidated accounts are not proposed in the drop down where you select
accounts.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_lines_sort.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_lines_sort.html.zpt
index b4cf36a581ca6a0a2b5b067cfc6a9802d945637c..eda5e7b38704de713c44a776c8969dd348d77044 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_lines_sort.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_lines_sort.html.zpt
@@ -7,13 +7,13 @@
Test Simple view of an Accounting Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_related_payment.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_related_payment.html.zpt
index a60917e44cca3977718ca93acc78daf83896dc33..172e49a5da94e09ad4346d1848409caead7da3f5 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_related_payment.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_related_payment.html.zpt
@@ -7,13 +7,13 @@
Test for Creating Payment Transactions related to some Invoices
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_reversal.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_reversal.html.zpt
index 4f562eee066b48de0bf7a63ef873bd82d994a1dc..80a8187899b61e45180075de7c57334b63c31f90 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_reversal.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_reversal.html.zpt
@@ -6,13 +6,13 @@
<tr><td rowspan="1" colspan="4">
Test for Creating reversal of multiple transactions
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&transaction_state=delivered">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&transaction_state=delivered">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_section_selection_check.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_section_selection_check.html.zpt
index f3e056cb63d7eba6f1a07b2f677fe29b1f720a00..9d82a23b1aad6bc318ec36348b32b3c66afa334a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_section_selection_check.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_section_selection_check.html.zpt
@@ -8,13 +8,13 @@ Test Section Selection for Accounting Transaction.
</td></tr>
<!-- XXX we do not need init method here ! -->
</thead><tbody tal:define="init_method string:">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<!-- Reset Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -68,7 +68,7 @@ Test Section Selection for Accounting Transaction.
<!-- Modify Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_unsetDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_resetAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -112,7 +112,7 @@ Test Section Selection for Accounting Transaction.
<!-- Reset Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.zpt
index 101b35a24e8939971baffe8c08cdc90e930de7cf..0a9e36f04f231a32724193ce5063498f3387a99c 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.zpt
@@ -7,13 +7,13 @@
Test Simple view of an Accounting Transaction with Multiple partners
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_section_selection_check.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_section_selection_check.html.zpt
index 758ecde8195b7e88cd006313a5e557d521589945..2504aec8bee1a75b0b04af05eefe8b8843eaa901 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_section_selection_check.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_section_selection_check.html.zpt
@@ -8,12 +8,12 @@ Test Section Selection for Payment Transaction.
</td></tr>
<!-- XXX we do not need init method here ! -->
</thead><tbody tal:define="init_method string:">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -67,7 +67,7 @@ Test Section Selection for Payment Transaction.
<!-- Modify Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_unsetDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_resetAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -111,7 +111,7 @@ Test Section Selection for Payment Transaction.
<!-- Reset Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.zpt
index 1eda22e7fcf1aeb3096325d0f32e3c9b96004a7e..e46d04593d5afada8447882ae7fe69a5892cade0 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.zpt
@@ -7,13 +7,13 @@
Test for Creating Reversal Transaction for a Purchase Invoice Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_section_selection_check.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_section_selection_check.html.zpt
index 5bf4fe77afd56f45c9adb5c50ab8859afbd9a031..6431eece8cc858211900debe0331a92374db7679 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_section_selection_check.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_section_selection_check.html.zpt
@@ -8,12 +8,12 @@ Test Section Selection for Purchase Invoice Transaction.
</td></tr>
<!-- XXX we do not need init method here ! -->
</thead><tbody tal:define="init_method string:">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -67,7 +67,7 @@ Test Section Selection for Purchase Invoice Transaction.
<!-- Modify Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_unsetDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_resetAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -111,7 +111,7 @@ Test Section Selection for Purchase Invoice Transaction.
<!-- Reset Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.zpt
index 5a139137109bbd0aa586db1d7ff214df9d0bb2ae..17e39da6ba852cfeaa7e8a795cd2da285f7d7cd6 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.zpt
@@ -7,13 +7,13 @@
Test for Creating Reversal Transaction for a Sale Invoice Transaction
</td></tr>
<!-- XXX we do not need init method here ! -->
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_section_selection_check.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_section_selection_check.html.zpt
index 23edf62e93c62b017a4a7fa54d8a1c6369a7b83b..26dd4a3a93807aadfb5780087b9add4141898b6d 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_section_selection_check.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_section_selection_check.html.zpt
@@ -8,12 +8,12 @@ Test Section Selection for Sale Invoice Transaction.
</td></tr>
<!-- XXX we do not need init method here ! -->
</thead><tbody tal:define="init_method string:">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -67,7 +67,7 @@ Test Section Selection for Sale Invoice Transaction.
<!-- Modify Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_unsetDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_resetAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
@@ -111,7 +111,7 @@ Test Section Selection for Sale Invoice Transaction.
<!-- Reset Preference -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setDocumentSectionPreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestDocumentSectionPreference</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.zpt
index c7a6a642193e1d739b927405857b1779a84dac73..0cfb56d6e795dcdd075e03c6682d51be3a225720 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test display of Account Module, with at_date parameter
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.zpt
index 14def07d17a245a56fe733a8bd344a5e1158e17f..e5cf5f0adf86a14cfe9e064bea77e14584058c8d 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.zpt
@@ -6,9 +6,9 @@
<tr><td rowspan="1" colspan="4">
Test default display of Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.zpt
index 6dec3bf2f4421b8b9194d1a181c27ec9cedf985e..82c86b1fc55cd5eb366ecaada2c881261e275609 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test default display of Account Module With Employees.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListWithPersons">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListWithPersons">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.zpt
index f3dbb73e091effe1996f1f80b54b6fb433c3d7af..011a731e80726a3480995d21d963b8eb7efcf88b 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test domain tree of Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.zpt
index 4f0b1bc99b7b3a8bfbe01085f06392fb7a0aa03c..bcd0bcc89477969ba8548b10be056b7db8f7fdfd 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test filter in Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.zpt
index 523f0e35e5bc7735ac346fed260577f63374ec94..a84b4a040f376607a73feae5593b1f3458efc80e 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test display of Account Module, with from_date parameter (which has no impact)
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.zpt
index a6ac4f92fb3578171188a6ec78aaa1dd8165a0ae..2f2464806182a21ad5b07052df749ef3d1be4918 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.zpt
@@ -6,13 +6,13 @@
<tr><td rowspan="1" colspan="4">
Test `preferred_gap_id` column of Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_setAccountReferencePreference</td>
+ <td>${base_url}/PreferenceTool_setAccountingTestAccountReferencePreference</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.zpt
index 582adc8245c16bb865aa8f4d06eb908ef1b78050..da475bccf3ff3063497975a98876d52a63839dcb 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test `preferred_gap_id` column of Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.zpt
index b0f3f4410cf3133da02026bdafa8c71a9d39c05e..a5ed77e3e134bd7361479d7bcdd1f4c0185584cf 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test search columns of Account Module
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.zpt
index 8d4b5088b2cd1da8cb2a54985f87895c60b6e6c4..bbe59c5bb2be89d508c95602f4b022217d7e9307 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test changing state in accounting module (with custom search)
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
@@ -92,7 +92,7 @@ Test changing state in accounting module (with custom search)
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.zpt
index 1c31020eae70947cb3edf10e4e847efd0a925e2a..3c5a375eedd4f7e17ecbca3e4bbad25d01a32987 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.zpt
@@ -6,13 +6,13 @@
<tr><td rowspan="1" colspan="4">
Test Accounting module listbox supports deleting
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&transaction_state=draft">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&transaction_state=draft">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.zpt
index f529c76c73068081b653d4392b298a0a368df248..d8b9d64d17a1c1e34ee92d43a0380d888b39bb1d 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Accounting Transaction Module Displays empty Transactions
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
@@ -44,7 +44,7 @@ Accounting Transaction Module Displays empty Transactions
</tr>
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.zpt
index bc84ca7a735ce741aed16fc635164fa98c207249..e60231a62e7d4e1827cf601e90816bb62860948a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test Accounting module listbox supports filtering
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.zpt
index 44a121f6d66165df10cd38333285182ba8171a55..4e658e4c4f9aac5683033c1abd66ae397852b209 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Accounting module listbox multi pages
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=12">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=12">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.zpt
index 14b4655b6e261e82ef7a31be441d51c09b970508..232a460cb2d3133d408205cde3ccade0d61739ad 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Accounting Transaction Module Search Columns
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- setup {{{ -->
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.zpt
index 9705b1f0e90a6c164889f78bee8fbcb2e50833ac..72bdbb81959e4ee9c3a48cf30ac0c60cddb92c88 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Accounting Transaction Module Search Dialog: seach by amount
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- setup {{{ -->
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.zpt
index a6fe835d7d8ffe6a0f8c30a3a867bbdcb659a680..7e682d441048ebc1d50b115a69b6451fcf754e30 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Accounting Transaction Module Search Dialog: seach by date
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- setup {{{ -->
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.zpt
index bc03582a4b5ba7e8b07796e0f4339284e6c54007..7300fdc268f2255a606f1dcf311ed732319a7914 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test sort for Accounting module main listbox
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.zpt
index f7d4edc0b82628eeb7c9bc460e18dc04fa43a18d..44f2f24066903d7ee3d706642f60e1cada9ebb23 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.zpt
@@ -6,8 +6,8 @@
<tr><td rowspan="1" colspan="4">
Test sort for Accounting module main listbox, without section
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Setup {{{ -->
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.zpt
index b1e0c607d6b69f8586513435654297dc62ab0465..3a5a4637f0154558429fc62e49f320f319c6684c 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.zpt
@@ -7,10 +7,10 @@
Accounting Transaction Module and transactions with employees, which acquire
the group category from their subordination
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListWithPersons">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListWithPersons">
<!-- setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.zpt
index 400bc3f7545f2b5fda702f46002b749af995b1f4..31d6892f3b47b64b0527a1d491a95d3d16b9d91f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.zpt
@@ -6,12 +6,12 @@
<tr><td rowspan="1" colspan="4">
Test Accounting Transaction Template
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_initializeAccountingTransactionTemplateTest">
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_initializeAccountingTransactionTemplateTest">
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<!-- Delete existing accounting transaction templates -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_deleteAccountingTransactionTemplate</td>
+ <td>${base_url}/ERP5Site_deleteAccountingTransactionTemplate</td>
<td></td>
</tr>
<tr>
@@ -131,7 +131,7 @@ Test Accounting Transaction Template
<!-- Remove Accounting Transactions -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_initializeAccountingTransactionTemplateTest</td>
+ <td>${base_url}/AccountingTransactionModule_initializeAccountingTransactionTemplateTest</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.zpt
index 6c21cd68a44d8ad439a73531ef26d7e76f1afc50..73ec2ab1c0fd9fae03383bc32576cf738b12b3f3 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an account
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_gap_parallel_list_field.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_gap_parallel_list_field.html.zpt
index 8cdb7c80fc3647772fa6b36b6e16e10c8fc3a4df..1e4eb3ff6d7bb5e649296917778c6364ece13cbe 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_gap_parallel_list_field.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_gap_parallel_list_field.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Account GAP Parallel listfield.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.zpt
index 6ab0eae6fcc539d13a096ead158c3f9435a1a21e..32a5f9e70330f7a86d2105a38fa5554686435856 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an account
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.zpt
index 302c520079510ed719255e30d23b1f6d8ea99b47..7a3eb1ac489696220639ee480eca64060171d931 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an account, with at date parameter
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.zpt
index 9190c722de8f1b3c6f60c8777645c383bbdf29d5..dd3ce315fb5f7af726ae5c7af469f1d49df151a0 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an account, with from date parameter
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.zpt
index c772b2b94092db44ebfef408bad9ac2251d0d6cb..79913ff1e457abbe88ac4a2fefea4b196fce21ef 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Account Transaction List then jump to accounting module.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.zpt
index 32c238948d28435209bb9ad43d3250cdd9936325..99c3e0cacb48eafa2e60b538a0fa1ea2354950ac 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test for jump methods from an Organisation.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.zpt
index 931a92b463adfbbc2d3cfab5befaf91ac22e0bb4..28ddbe8e7e9a09d1acf749d1a1530ce920e7e26d 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an Organisation
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.zpt
index f6bab04b775b8770fcab8fb08705eebbd0ceecff..914298a05f1ce5f0f687d97833fbd1933f5b393e 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an Organisation, with stop date
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.zpt
index 72f4ac7535d28e12f5512ee92c8f239c450a2da4..afa19bc2d57e6636523cc777a1525895e2ff5b64 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an Organisation, with start date
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.zpt
index 3e423e127f13e97d1ae740eeb0970212482a6a6b..072b36083a2287145e35d1024f07ecd7ca2a1960 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Test Transactions related to an Organisation, with multiple pages and date range
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionListSalesAndPayments">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionListSalesAndPayments">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.zpt
index 221dba2ea30d45e58b72180e283ea4ce01c7cd8d..ba703b521d156ba0cf99fff31bdcb3c4fc77d473 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.zpt
@@ -7,10 +7,10 @@
Test Transactions related to an Organisation shows transactions for this
organisation and no bogus parameters are kept in the selection.
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
index d5c4cdf9ef7ccf8d4355f764e18a4e54efdc1955..4958f460e98b36d9b10714509ce826308f03d5bb 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_filter_by_section_category.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Filtering Grouping Dialog by section category
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
index 25c5ecc1944719818a29968494bb512bc36dc72c..ac4540ebb57a0eeb7b158fa2498ee4eec4e27781 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Using Ledger in Grouping Dialog
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_searching.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_searching.html.zpt
index 0473f27a0ae6a98dff6699df4c50bc00012fee2f..327987545c7e621de25dbbcecca27e1068095fcf 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_searching.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_searching.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Sorting in Grouping Dialog
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.zpt
index 020c14e69f9cebd3fd305bb76d0b86fbe4d91479..42f1927959afa6faffc8199b3e0edbd19f77eab6 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Sorting in Grouping Dialog
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
index a07aa4456da8b7e819b8d4f555f881649216bff8..fb3cffb731a9d4fa52b12783992fd6306a5bf6ac 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Grouping from account transaction view
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
@@ -130,7 +130,7 @@ Grouping from account transaction view
<!-- mark the module as changed, reindex and come back to the account -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
index c6fb9fb4cd2330369da9181f88afa7a6c84ea8c1..e13165a8dc722e0d29d75669facca51df7d300ec 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Grouping from entity transaction view
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
@@ -114,7 +114,7 @@ Grouping from entity transaction view
<!-- mark the module as changed, reindex and come back to the entity -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.zpt
index c1057471e2bb22723ea1b5b4b7045f69df226eae..9749bed8a23c8ece64da150aaf89e037fd385e3f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Grouping with multiple pages
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=6&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=6&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
@@ -123,7 +123,7 @@ Grouping with multiple pages
<!-- mark the module as changed, reindex and come back to the entity -->
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_markChanged</td>
+ <td>${base_url}/AccountingTransactionModule_markAccountingTestDataChanged</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_selected_amount_updated_when_searching.html.zpt b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_selected_amount_updated_when_searching.html.zpt
index 33274f85caa3c03275c38f34e7fa21430a09fd82..6021e9d4ccb9908f0d9c7d738c34078fba128a70 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_selected_amount_updated_when_searching.html.zpt
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_selected_amount_updated_when_searching.html.zpt
@@ -6,10 +6,10 @@
<tr><td rowspan="1" colspan="4">
Selected amount updated when searching
</td></tr>
-</thead><tbody tal:define="init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=6&add_related_payments:int=1">
+</thead><tbody tal:define="init_method string:AccountingTransactionModule_createAccountingTransactionList?add_draft_transactions:int=0&month_count:int=6&add_related_payments:int=1">
<!-- Setup {{{ -->
-<tal:block metal:use-macro="here/AccountingZuite_CommonTemplate/macros/init"/>
+<tal:block metal:use-macro="here/ERP5Site_viewAccountingZuiteCommonTemplate/macros/init"/>
<tr>
<td>selectAndWait</td>
<td>select_module</td>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestDocument.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestDocument.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestDocument.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestDocument.xml
index 852580eb1d541367709c3a7c4ee0a66fa8f6f014..46fa72a29543952cf784f196c7a44637ee7b9277 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestDocument.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createDocument</string> </value>
+ <value> <string>AccountingTransactionModule_createAccountingTestDocument</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.py
similarity index 88%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.py
index ea529736e559b54921e0a4bb46b63082204d78f1..0ce90045afe602de300f6f2b8a070affaa3a4dcb 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.py
@@ -8,7 +8,6 @@ from DateTime import DateTime
portal = context.getPortalObject()
person_module = portal.person_module
-accounting_module = portal.accounting_module
account_module = portal.account_module
organisation_module = portal.organisation_module
@@ -19,7 +18,7 @@ today = DateTime(now.year(), now.month(), now.day()) + 8 * one_hour
yesterday = today - one_day
tomorrow = today + one_day
-bank1 = context.AccountingZuite_createDocument(
+bank1 = context.AccountingTransactionModule_createAccountingTestDocument(
parent=organisation_module.my_organisation,
portal_type='Bank Account',
title='Bank1',
@@ -28,7 +27,7 @@ bank1 = context.AccountingZuite_createDocument(
bank2 = bank1
if two_banks:
- bank2 = context.AccountingZuite_createDocument(
+ bank2 = context.AccountingTransactionModule_createAccountingTestDocument(
parent=organisation_module.my_organisation,
portal_type='Bank Account',
title='Bank2',
@@ -36,7 +35,7 @@ if two_banks:
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 1',
source_reference='1',
@@ -52,7 +51,7 @@ context.AccountingZuite_createDocument(
source_credit=100.0)),
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 2',
source_reference='2',
@@ -70,7 +69,7 @@ context.AccountingZuite_createDocument(
# in the period
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Payment Transaction',
title='Transaction 3',
source_reference='3',
@@ -87,7 +86,7 @@ context.AccountingZuite_createDocument(
source_credit=300.0)),
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Payment Transaction',
title='Transaction 4',
destination_reference='4',
@@ -106,7 +105,7 @@ context.AccountingZuite_createDocument(
destination_credit=400.0)),
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 5',
source_reference='5',
@@ -123,7 +122,7 @@ context.AccountingZuite_createDocument(
source_credit=500.0)),
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Purchase Invoice Transaction',
title='Transaction 6',
destination_reference='6',
@@ -143,7 +142,7 @@ context.AccountingZuite_createDocument(
# another simulation state
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 7',
source_reference='7',
@@ -162,7 +161,7 @@ context.AccountingZuite_createDocument(
# after the period
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 8',
source_reference='8',
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.xml
index 6249e557417d817452dba0575ac22b538f263500..f939129faa272983a5f1a20b86c7818b6e3f2a73 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportDataset.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createReportDataset</string> </value>
+ <value> <string>AccountingTransactionModule_createAccountingTestReportDataset</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.py
similarity index 90%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.py
index 1adb024da4dae32a02ae2992ac4182dcb2572f64..4e31815f5bf8476fef37c590dbc2a58a7ca3f882 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.py
@@ -1,7 +1,6 @@
from DateTime import DateTime
portal = context.getPortalObject()
-accounting_module = portal.accounting_module
account_module = portal.account_module
one_hour = 1.0 / 24.0
@@ -10,7 +9,7 @@ yesterday = today - 1
tomorrow = today + 1
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
simulation_state='delivered',
start_date=yesterday,
@@ -23,7 +22,7 @@ context.AccountingZuite_createDocument(
"source_credit": 100}
]
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Sale Invoice Transaction',
title='First One',
simulation_state='delivered',
@@ -42,7 +41,7 @@ context.AccountingZuite_createDocument(
"source_credit": 100.00},
]
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Sale Invoice Transaction',
title='Second One',
simulation_state='delivered',
@@ -65,7 +64,7 @@ context.AccountingZuite_createDocument(
"source_credit": 200.00},
]
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Sale Invoice Transaction',
title='Third One',
simulation_state='delivered',
@@ -85,7 +84,7 @@ context.AccountingZuite_createDocument(
"source_credit": 300.00},
]
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
simulation_state='delivered',
start_date=today,
@@ -98,7 +97,7 @@ context.AccountingZuite_createDocument(
"source_credit": 111},
]
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Sale Invoice Transaction',
simulation_state='delivered',
destination_section_value=portal.organisation_module.client_2,
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..660f68a1adbda5f9c71a9244cfb0b486cf95d541
--- /dev/null
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransactionModule_createAccountingTestReportJournalDataset</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.py
similarity index 94%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.py
index 7ddf745376efdc6e9458aae33de23edc9685f9c4..cf1f9d683f0088fa9d3d085c0b81ccdafeae0b5b 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.py
@@ -41,10 +41,9 @@ for accounting_type_id in portal.getPortalAccountingTransactionTypeList():
ledger_value_list=list(portal.portal_categories.ledger.test_accounting.contentValues())
if set_ledger else ())
-test_ledger_1 = test_ledger_2 = None
+test_ledger_1 = None
if set_ledger:
test_ledger_1 = portal.portal_categories.ledger.test_accounting.test_ledger_1
- test_ledger_2 = portal.portal_categories.ledger.test_accounting.test_ledger_2
def getAccountByTitle(title):
account_list = [x.getObject().getRelativeUrl() for x in
@@ -65,13 +64,6 @@ section = getOrganisationByTitle(section_title)
euro_resource = 'currency_module/euro'
-def getBankAccountByTitle(title):
- document_list = [x.getObject().getRelativeUrl() for x in
- portal.portal_catalog(portal_type='Bank Account',
- title=SimpleQuery(title=title, comparison_operator='='))]
- assert len(document_list) == 1, \
- '%d Bank Account with title "%s"' % (len(document_list), title)
- return document_list[0]
product_list = [o.getObject() for o in portal.portal_catalog(
portal_type='Product',
@@ -82,7 +74,7 @@ else:
product = portal.product_module.newContent(portal_type='Product',
title='Dummy Product for testing')
-for i in range(random.randint(5, 10)):
+for _ in range(random.randint(5, 10)):
pl = portal.sale_packing_list_module.newContent(
portal_type='Sale Packing List',
title='Dummy Packing List for testing',
@@ -211,7 +203,7 @@ for month in range(1, month_count + 1):
for line in payment.getMovementList(
portal_type=payment.getPortalAccountingMovementTypeList()):
if line.getGroupingReference():
- line.activate(after_tag=tag).AccountingTransactionLine_resetGroupingReference()
+ line.activate(after_tag=tag).AccountingTransactionLine_resetGroupingReference()
else:
# other cases not supported for now
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.xml
index d801dedd79b3855f7c3d482841d56e31a86988fe..5b7e0617cfbf0e302232036a261ede50b9e4476d 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionList.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createAccountingTransactionList</string> </value>
+ <value> <string>AccountingTransactionModule_createAccountingTransactionList</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.py
similarity index 96%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.py
index 9b02f3ab7b316c2fede121ab4e8cf5e9d9bc25b3..4aa8da10f29745a887f1eb8b510c2395238e330f 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.py
@@ -8,8 +8,6 @@ portal = context.getPortalObject()
accounting_module = portal.accounting_module
year = 2005
-total_receivable_quantity = 0
-
# if the previous test didn't change input data, no need to recreate content
current_script_data_id = '%s_month_count_%s' % (
month_count, script.getId())
@@ -75,7 +73,6 @@ for month in range(1, month_count + 1):
specialise=business_process,
)
receivable_qty = -(amount * (1 + vat_rate))
- total_receivable_quantity += receivable_qty
tr.newContent(portal_type='Sale Invoice Transaction Line',
source=getAccountByTitle('Receivable'),
destination=getAccountByTitle('Payable'),
@@ -123,7 +120,7 @@ for month in range(1, month_count + 1):
for line in ptr.getMovementList(
portal_type=ptr.getPortalAccountingMovementTypeList()):
if line.getGroupingReference():
- line.activate(after_tag=tag).AccountingTransactionLine_resetGroupingReference()
+ line.activate(after_tag=tag).AccountingTransactionLine_resetGroupingReference()
accounting_module.setProperty('current_content_script',
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.xml
similarity index 94%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.xml
index 1f1630585c824657c9dbdc8f63b61fe6753d0a79..a03e31e2ee70c91e2dbcb6d19f49711a12b4d2a2 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListSalesAndPayments.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createAccountingTransactionListSalesAndPayments</string> </value>
+ <value> <string>AccountingTransactionModule_createAccountingTransactionListSalesAndPayments</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.py
similarity index 91%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.py
index 9349e793fcb1d8d84364aed59d464905b5b48751..8cb99dcdd970dfe987a0b281bcb06fdd2b221db6 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.py
@@ -60,14 +60,6 @@ def getCurrencyByReference(reference):
return document_list[0]
euro_resource = getCurrencyByReference('EUR')
-def getBankAccountByTitle(title):
- document_list = [x.getObject().getRelativeUrl() for x in
- portal.portal_catalog(portal_type='Bank Account',
- title=SimpleQuery(title=title, comparison_operator='='))]
- assert len(document_list) == 1, \
- '%d Bank Account with title "%s"' % (len(document_list), title)
- return document_list[0]
-
for month in range(1, month_count + 1):
day = 1
vat_rate = .1
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.xml
similarity index 94%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.xml
index 2f82bb69cc67105d39c17db812591d72cd114eba..c25656c7b9f78145b20e99e8b71fb1653eec1876 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTransactionListWithPersons.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createAccountingTransactionListWithPersons</string> </value>
+ <value> <string>AccountingTransactionModule_createAccountingTransactionListWithPersons</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.py
similarity index 76%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.py
index eb01e446b3d0d60837ad17b3ccc5011717b258a5..cc3fee08d1ae97e409b7806877db2e1645364535 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.py
@@ -7,18 +7,18 @@ module = portal.accounting_module
# This option is necessary for RJS interface to render Reports
# If you'd keep XHTML value "View" the RJS will not crash it will
# only refuse to validate Report Form View
-portal.AccountingZuite_setAccountReferencePreference(report_style=report_style)
+portal.PreferenceTool_setAccountingTestAccountReferencePreference(report_style=report_style)
# First, clean up the module
module.manage_delObjects(list(module.objectIds()))
# Create datasets
if report_name == "journal":
- module.AccountingZuite_createReportJournalDataset()
+ module.AccountingTransactionModule_createAccountingTestReportJournalDataset()
elif report_name in ("trial-balance", "general-ledger"):
- module.AccountingZuite_createReportDataset()
+ module.AccountingTransactionModule_createAccountingTestReportDataset()
elif report_name in ("account-statement", "balance-sheet", "profit-and-loss"):
- module.AccountingZuite_createReportDataset(two_banks=True)
+ module.AccountingTransactionModule_createAccountingTestReportDataset(two_banks=True)
elif report_name == "other-parties":
module.AccountingZuite_createReportOtherPartiesDataset(with_ledger=False)
elif report_name == "other-parties-ledger":
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.xml
index ed0a1520f1898b0dc04b50d6abcceee30da3fc63..b83a1648620fe4715bf37feea29848113880373b 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionReportTest.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_initializeAccountingTransactionReportTest</string> </value>
+ <value> <string>AccountingTransactionModule_initializeAccountingTransactionReportTest</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionTemplateTest.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionTemplateTest.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionTemplateTest.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionTemplateTest.xml
index 56dfd1654f0a450460e0c4fdd1ad6a76cc9dd566..20cab49f2aed60ccc8aa7466f1950fca8ce4d304 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_initializeAccountingTransactionTemplateTest.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_initializeAccountingTransactionTemplateTest</string> </value>
+ <value> <string>AccountingTransactionModule_initializeAccountingTransactionTemplateTest</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_markAccountingTestDataChanged.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_markAccountingTestDataChanged.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_markAccountingTestDataChanged.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_markAccountingTestDataChanged.xml
index 57afd820a8a140f539d4f6e6001dde9134535d6f..5c6a9adae753aba1e0d30fa4356230a038036f10 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_markAccountingTestDataChanged.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_deleteAccountingTransactionTemplate</string> </value>
+ <value> <string>AccountingTransactionModule_markAccountingTestDataChanged</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportAgedBalanceDataset.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportAgedBalanceDataset.py
index 025fd3b3f96d1fead97c695ec3878655e071036a..37541696c60e6b4c1cdf13c833c90cae980d56f2 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportAgedBalanceDataset.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportAgedBalanceDataset.py
@@ -29,11 +29,11 @@ def get_object_by_title(portal_type, title):
bank1 = get_object_by_title(portal_type='Bank Account', title='Bank1')
if bank1 is None:
- bank1 = portal.AccountingZuite_createDocument(
+ bank1 = portal.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Bank Account', title='Bank1', simulation_state='validated',
parent=organisation_module.my_organisation)
-purchase1 = portal.AccountingZuite_createDocument(
+purchase1 = portal.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Purchase Invoice Transaction',
title='Purchase invoice 1',
destination_reference='1',
@@ -51,7 +51,7 @@ purchase1 = portal.AccountingZuite_createDocument(
destination_credit=500.0)),
)
-sale2 = portal.AccountingZuite_createDocument(
+sale2 = portal.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Sale Invoice Transaction',
title='Sale invoice 2',
source_reference='2',
@@ -71,7 +71,7 @@ sale2 = portal.AccountingZuite_createDocument(
portal.Zuite_waitForActivities()
-payment3 = portal.AccountingZuite_createDocument(
+payment3 = portal.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Payment Transaction',
title='Payment 1',
source_reference='3',
@@ -90,7 +90,7 @@ payment3 = portal.AccountingZuite_createDocument(
source_credit=500.0)),
)
-payment4 = portal.AccountingZuite_createDocument(
+payment4 = portal.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Payment Transaction',
title='Payment 2',
source_reference='4',
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportOtherPartiesDataset.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportOtherPartiesDataset.py
index 34d77d11fe204fb151b24fa8d5be5b596b35a799..50478734c3b3148ee219b8fc46a98b2732373897 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportOtherPartiesDataset.py
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportOtherPartiesDataset.py
@@ -46,7 +46,7 @@ else:
extra_kwargs_general = {}
extra_kwargs_detailed = {}
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 1',
source_reference='1',
@@ -62,7 +62,7 @@ context.AccountingZuite_createDocument(
**extra_kwargs_general
)
-context.AccountingZuite_createDocument(
+context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 2',
source_reference='2',
@@ -78,7 +78,7 @@ context.AccountingZuite_createDocument(
)
if with_ledger:
- context.AccountingZuite_createDocument(
+ context.AccountingTransactionModule_createAccountingTestDocument(
portal_type='Accounting Transaction',
title='Transaction 3',
source_reference='3',
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.xml
deleted file mode 100644
index bc885af2769cbf5c45b8af286e2b517dc5f1496f..0000000000000000000000000000000000000000
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>AccountingZuite_unsetDocumentSectionPreference</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_deleteAccountingTransactionTemplate.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_deleteAccountingTransactionTemplate.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_deleteAccountingTransactionTemplate.xml
similarity index 96%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_deleteAccountingTransactionTemplate.xml
index 12bf0e99a9df631df586d265d9dcebe8c1aca017..6bce9bd14eb54ec940db540398002d7f381422db 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_deleteAccountingTransactionTemplate.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_createReportJournalDataset</string> </value>
+ <value> <string>ERP5Site_deleteAccountingTransactionTemplate</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_resetConfigurationForAccountingTest.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_resetConfigurationForAccountingTest.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_resetConfigurationForAccountingTest.xml
similarity index 96%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_resetConfigurationForAccountingTest.xml
index 64253451c0f2942018650b57363f695ce32d269b..771142bf3b429ef4c5ec1028f4ff5254c73ac13e 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_resetConfigurationForAccountingTest.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_setDocumentSectionPreference</string> </value>
+ <value> <string>ERP5Site_resetConfigurationForAccountingTest</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.xml
index dd612b617831f240f92dcf82814ce9c1501e65c4..1709ce6ddd2c967039d2ed2f6d2cbb6ef3421596 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.xml
@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_reportMacros</string> </value>
+ <value> <string>ERP5Site_viewAccountingZuiteCommonTemplate</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.zpt b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.zpt
similarity index 93%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.zpt
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.zpt
index 8c6c5b5809b94db62f41361c0ecff7070454120a..aa739951e1983b1b6c4547e4bae427e8951814c3 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.zpt
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/ERP5Site_viewAccountingZuiteCommonTemplate.zpt
@@ -4,7 +4,7 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
<tr>
<td>open</td>
- <td>${base_url}/AccountingZuite_reset</td>
+ <td>${base_url}/ERP5Site_resetConfigurationForAccountingTest</td>
<td></td>
</tr>
<tr>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_resetAccountingTestDocumentSectionPreference.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_resetAccountingTestDocumentSectionPreference.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_resetAccountingTestDocumentSectionPreference.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_resetAccountingTestDocumentSectionPreference.xml
index 181560ed60f331f65577c793add6837330303e0d..6defe51ca39da3595a50d13a5108b3ac249a1523 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_resetAccountingTestDocumentSectionPreference.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_reset</string> </value>
+ <value> <string>PreferenceTool_resetAccountingTestDocumentSectionPreference</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestAccountReferencePreference.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestAccountReferencePreference.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestAccountReferencePreference.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestAccountReferencePreference.xml
index bd70302cc31a92729c29154cc85fb0435aba8603..4c592719a8ae4968693c80517cd03c274154cadf 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestAccountReferencePreference.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_setAccountReferencePreference</string> </value>
+ <value> <string>PreferenceTool_setAccountingTestAccountReferencePreference</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.py b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestDocumentSectionPreference.py
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.py
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestDocumentSectionPreference.py
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestDocumentSectionPreference.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestDocumentSectionPreference.xml
index d404805d90b040f21f901f85b663caf4ccf20656..2fb806d94913dced313c3d552b3f4fba219f9a28 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/PreferenceTool_setAccountingTestDocumentSectionPreference.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_markChanged</string> </value>
+ <value> <string>PreferenceTool_setAccountingTestDocumentSectionPreference</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/Zuite_viewAccountingTestReportMacros.xml
similarity index 95%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/Zuite_viewAccountingTestReportMacros.xml
index e790a1e5f9b8b6bb84b79fc19f9304b1415fb03a..a0c5f9e4afd622b5f1a7bc29346e7ef10977acf3 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/Zuite_viewAccountingTestReportMacros.xml
@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>AccountingZuite_CommonTemplate</string> </value>
+ <value> <string>Zuite_viewAccountingTestReportMacros</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.zpt b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/Zuite_viewAccountingTestReportMacros.zpt
similarity index 100%
rename from bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.zpt
rename to bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/Zuite_viewAccountingTestReportMacros.zpt
diff --git a/bt5/erp5_accounting_ui_test/bt/description b/bt5/erp5_accounting_ui_test/bt/description
index a9a37d11c8595258307bc6d6fb4a33bb1f0966d6..2b1d6c81b92580ceb7425c3f3dca605019eae8da 100644
--- a/bt5/erp5_accounting_ui_test/bt/description
+++ b/bt5/erp5_accounting_ui_test/bt/description
@@ -1,3 +1,3 @@
-Functional test suites for erp5_accounting.
-
+Functional test suites for erp5_accounting.
+
Contains sample data as path items that may overwrite your existing data. Use at your own risks.
\ No newline at end of file
diff --git a/bt5/erp5_accounting_ui_test/bt/skip_coding_style_test b/bt5/erp5_accounting_ui_test/bt/skip_coding_style_test
deleted file mode 100644
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000
--- a/bt5/erp5_accounting_ui_test/bt/skip_coding_style_test
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file