Make accounting_ui_test pass coding style

/reviewed-on nexedi/erp5!1003

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>

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>

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>

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  -->

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"/>

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"/>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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&amp;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&amp;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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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 {{{ -->

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 {{{ -->

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 {{{ -->

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createDocument.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.py → 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',

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportDataset.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.py → bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.py

 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,

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingTransactionModule_createAccountingTestReportJournalDataset.xml

+<?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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.py → 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',

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.py → 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'),

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.py → 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

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListWithPersons.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.py → 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":

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionReportTest.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_initializeAccountingTransactionTemplateTest.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_deleteAccountingTransactionTemplate.xml → 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>

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',

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',

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_unsetDocumentSectionPreference.xml

-<?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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createReportJournalDataset.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setDocumentSectionPreference.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reportMacros.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.zpt → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_setAccountReferencePreference.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_markChanged.xml → 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>

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml → 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>

bt5/erp5_accounting_ui_test/bt/skip_coding_style_test

-1
\ No newline at end of file