From 3efc33a5f8acf04f9ed4f3faba43d4b49f3e6ffd Mon Sep 17 00:00:00 2001
From: Mame Coumba Sall <mame@nexedi.com>
Date: Tue, 12 Mar 2013 18:30:25 +0100
Subject: [PATCH] Rename scripts used as listbox methods and import those
 changes where they're required

---
 ...le_getGeneralLedgerSummarySectionList.xml} |  2 +-
 ...ountModule_getTrialBalanceAccountList.xml} |  2 +-
 .../listbox.xml                               | 34 ++++++++++++++++++-
 .../listbox.xml                               | 16 ++++++++-
 .../CashContainer_fastInputForm/listbox.xml   |  2 +-
 ...s.xml => Listbox_getCashContainerList.xml} |  2 +-
 .../listbox.xml                               |  2 +-
 ...book.xml => Listbox_listCheckbookList.xml} |  2 +-
 .../StopPayment_fastInputForm/listbox.xml     |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 ...l => FastInput_initializeDocumentList.xml} |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  8 ++++-
 ...jects.xml => Base_getOrphanObjectList.xml} |  4 +--
 .../Base_viewOrphanObjectList/listbox.xml     |  2 +-
 ...izeListBoxToGetProxyFieldToRenameList.xml} |  4 +--
 ...iewListBoxToGetProxyFieldToRenameList.xml} |  4 +--
 .../listbox.xml                               |  2 +-
 .../preview_listbox.xml                       |  2 +-
 ...e_getTransformedResourceInventoryList.xml} |  2 +-
 .../listbox.xml                               |  2 +-
 .../listbox.xml                               |  2 +-
 ...> Project_initializeFastInputTaskList.xml} |  2 +-
 .../listbox.xml                               |  2 +-
 product/ERP5/Tool/TemplateTool.py             |  2 +-
 ...usinessTemplate_getModifiedObjectList.xml} |  2 +-
 .../listbox.xml                               |  2 +-
 ...l_getFromRequestImportReportFieldList.xml} |  2 +-
 .../CategoryTool_viewImportReport/listbox.xml |  2 +-
 .../ERP5Site_checkNamingConventions.xml       |  3 +-
 product/ERP5/tests/testBusinessTemplate.py    |  4 +--
 product/ERP5Type/tests/ERP5TypeTestCase.py    |  8 ++---
 41 files changed, 100 insertions(+), 49 deletions(-)
 rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/{AccountModule_getGeneralLedgerSummary.xml => AccountModule_getGeneralLedgerSummarySectionList.xml} (99%)
 rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/{AccountModule_getAccountListForTrialBalance.xml => AccountModule_getTrialBalanceAccountList.xml} (99%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{ListBox_listCashContainers.xml => Listbox_getCashContainerList.xml} (98%)
 rename bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/{ListBox_listCheckbook.xml => Listbox_listCheckbookList.xml} (98%)
 rename bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/{FastInput_initialize.xml => FastInput_initializeDocumentList.xml} (97%)
 rename bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/{Base_getOrphanObjects.xml => Base_getOrphanObjectList.xml} (98%)
 rename bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/{BusinessTemplate_initializeListBoxForRenameFastInput.xml => BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList.xml} (92%)
 rename bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/{BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml => BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList.xml} (94%)
 rename bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/{Resource_getTransformedResourceInventory.xml => Resource_getTransformedResourceInventoryList.xml} (99%)
 rename bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/{Project_initializeFastInput.xml => Project_initializeFastInputTaskList.xml} (97%)
 rename product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/{BusinessTemplate_getModifiedObject.xml => BusinessTemplate_getModifiedObjectList.xml} (98%)
 rename product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/{CategoryTool_getImportReportFromRequest.xml => CategoryTool_getFromRequestImportReportFieldList.xml} (96%)

diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummarySectionList.xml
similarity index 99%
rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummarySectionList.xml
index 5ced170400..5af5d0bde3 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummarySectionList.xml
@@ -122,7 +122,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>AccountModule_getGeneralLedgerSummary</string> </value>
+            <value> <string>AccountModule_getGeneralLedgerSummarySectionList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceAccountList.xml
similarity index 99%
rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceAccountList.xml
index 09f23c720a..e8daeae773 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceAccountList.xml
@@ -783,7 +783,7 @@ return new_line_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>AccountModule_getAccountListForTrialBalance</string> </value>
+            <value> <string>AccountModule_getTrialBalanceAccountList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountListForTrialBalance/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountListForTrialBalance/listbox.xml
index aea2261355..c20fa2d2dd 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountListForTrialBalance/listbox.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountListForTrialBalance/listbox.xml
@@ -323,6 +323,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -459,10 +463,18 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>global_search_column</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <int>25</int> </value>
@@ -483,6 +495,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_navigation_template</string> </key>
+                    <value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
+                </item>
                 <item>
                     <key> <string>page_template</string> </key>
                     <value> <string></string> </value>
@@ -503,6 +519,10 @@
                     <key> <string>report_tree</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>row_css_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>search</string> </key>
                     <value> <int>0</int> </value>
@@ -545,10 +565,22 @@
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>style_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>Accounts</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -569,7 +601,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>AccountModule_getAccountListForTrialBalance</string> </value>
+            <value> <string>AccountModule_getTrialBalanceAccountList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerSummary/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerSummary/listbox.xml
index 63abba42b3..062856424c 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerSummary/listbox.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerSummary/listbox.xml
@@ -417,6 +417,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>global_search_column</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
@@ -445,6 +449,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_navigation_template</string> </key>
+                    <value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
+                </item>
                 <item>
                     <key> <string>page_template</string> </key>
                     <value> <string></string> </value>
@@ -509,6 +517,12 @@
                     <key> <string>stat_method</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>style_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>General Ledger Summary</string> </value>
@@ -539,7 +553,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>AccountModule_getGeneralLedgerSummary</string> </value>
+            <value> <string>AccountModule_getGeneralLedgerSummarySectionList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox.xml
index eb173a0d29..b22d99dabb 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox.xml
@@ -628,7 +628,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>ListBox_listCashContainers</string> </value>
+            <value> <string>Listbox_getCashContainerList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Listbox_getCashContainerList.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Listbox_getCashContainerList.xml
index 6ec4ed203b..eb4238cf8f 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Listbox_getCashContainerList.xml
@@ -119,7 +119,7 @@ return context.ListBox_initializeFastInput()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ListBox_listCashContainers</string> </value>
+            <value> <string>Listbox_getCashContainerList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/listbox.xml
index 234cb4abbb..4d50c347d5 100644
--- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/listbox.xml
+++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/listbox.xml
@@ -563,7 +563,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>ListBox_listCheckbook</string> </value>
+            <value> <string>Listbox_listCheckbookList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_listCheckbook.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Listbox_listCheckbookList.xml
similarity index 98%
rename from bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_listCheckbook.xml
rename to bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Listbox_listCheckbookList.xml
index 370eba2f19..9bf36302d7 100644
--- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_listCheckbook.xml
+++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Listbox_listCheckbookList.xml
@@ -129,7 +129,7 @@ return context.ListBox_initializeFastInput()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ListBox_listCheckbook</string> </value>
+            <value> <string>Listbox_listCheckbookList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_fastInputForm/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_fastInputForm/listbox.xml
index 714bd7f439..f57ebdcd17 100644
--- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_fastInputForm/listbox.xml
+++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_fastInputForm/listbox.xml
@@ -525,7 +525,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>ListBox_initializeFastInput</string> </value>
+            <value> <string>Listbox_initializeFastInputDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml
index c1e225cca3..75a0ae48d6 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml
@@ -538,7 +538,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <unicode>ListBox_initializeFastInput</unicode> </value>
+            <value> <string>Listbox_initializeFastInputDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewContainerReportForm/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewContainerReportForm/listbox.xml
index c8270f8d75..3f36afe391 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewContainerReportForm/listbox.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewContainerReportForm/listbox.xml
@@ -570,7 +570,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>ListBox_initializeFastInput</string> </value>
+            <value> <string>Listbox_initializeFastInputDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput/listbox.xml
index 18308ad31e..ac17badf52 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentDecisionItems_addFastInput/listbox.xml
@@ -518,7 +518,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput/listbox.xml
index cb2fb699be..96f1cdcac7 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocumentItems_addFastInput/listbox.xml
@@ -518,7 +518,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput/listbox.xml
index 3c7c91f501..fcbe5acd25 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInput/listbox.xml
@@ -546,7 +546,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest/listbox.xml
index 65dfa7c345..235766427b 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisDocuments_addFastInputTest/listbox.xml
@@ -586,7 +586,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox.xml
index 271a2ed4c8..5aafb63baf 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexiconItems_addFastInput/listbox.xml
@@ -570,7 +570,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox.xml
index 9b47b70157..2e370335bb 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/DocumentAnalysisLexicons_addFastInput/listbox.xml
@@ -594,7 +594,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initializeDocumentList.xml
similarity index 97%
rename from bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml
rename to bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initializeDocumentList.xml
index 4d629bd64b..59fcc313d3 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initialize.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/FastInput_initializeDocumentList.xml
@@ -84,7 +84,7 @@ return l\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog/listbox.xml
index bc1a460673..618b4cf633 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewActorFastInputDialog/listbox.xml
@@ -558,7 +558,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog/listbox.xml
index 6dcd4903d3..9c23ce866d 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/TestCase_viewStepFastInputDialog/listbox.xml
@@ -546,7 +546,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox.xml
index 4ed7453087..4e0cd00104 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewActorFastInputDialog/listbox.xml
@@ -558,7 +558,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog/listbox.xml b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog/listbox.xml
index 34e67ea583..7581ee9335 100644
--- a/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog/listbox.xml
+++ b/bt5/erp5_consulting/SkinTemplateItem/portal_skins/erp5_consulting/UseCase_viewScenarioFastInputDialog/listbox.xml
@@ -524,6 +524,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Scenarii with Steps</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -547,7 +553,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>FastInput_initialize</string> </value>
+            <value> <string>FastInput_initializeDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjectList.xml
similarity index 98%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjectList.xml
index 301b0e1bf7..364072c9cf 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjectList.xml
@@ -86,7 +86,7 @@ for o in objects:\n
           # orphan object\n
           orphans_list.append(object_path)\n
       # Recursively check children\n
-      orphans_list.extend([x.uid for x in context.Base_getOrphanObjects(object=o)])\n
+      orphans_list.extend([x.uid for x in context.Base_getOrphanObjectList(object=o)])\n
 \n
 object_list = []\n
 for orphan in orphans_list:\n
@@ -107,7 +107,7 @@ return object_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Base_getOrphanObjects</string> </value>
+            <value> <string>Base_getOrphanObjectList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml
index 9bf6e23970..465dd46c00 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList/listbox.xml
@@ -509,7 +509,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>Base_getOrphanObjects</string> </value>
+            <value> <string>Base_getOrphanObjectList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList.xml
similarity index 92%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList.xml
index a32a8c1c97..0631bc1981 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxForRenameFastInput.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return context.ListBox_initializeFastInput(\n
+            <value> <string>return context.Listbox_initializeFastInputDocumentList(\n
   empty_line_number=10, **kw)\n
 </string> </value>
         </item>
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_initializeListBoxForRenameFastInput</string> </value>
+            <value> <string>BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList.xml
similarity index 94%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList.xml
index 9314d00c61..eb3ba16810 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxForRenameFastInput.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return context.ListBox_initializeFastInput(\n
+            <value> <string>return context.Listbox_initializeFastInputDocumentList(\n
   listbox_id=\'preview_listbox\', empty_line_number=0, **kw)\n
 </string> </value>
         </item>
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_initializePreviewListBoxForRenameFastInput</string> </value>
+            <value> <string>BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml
index 281dfa48a3..05d5bc5bed 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/listbox.xml
@@ -539,7 +539,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>BusinessTemplate_initializeListBoxForRenameFastInput</string> </value>
+            <value> <string>BusinessTemplate_initializeListBoxToGetProxyFieldToRenameList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml
index abe223d506..50f36fe6df 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyFieldDialog/preview_listbox.xml
@@ -555,7 +555,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>BusinessTemplate_initializePreviewListBoxForRenameFastInput</string> </value>
+            <value> <string>BusinessTemplate_initializePreviewListBoxToGetProxyFieldToRenameList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventoryList.xml
similarity index 99%
rename from bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml
rename to bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventoryList.xml
index 99430ecd5b..203a387363 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventoryList.xml
@@ -64,7 +64,7 @@ return context.portal_simulation.getInventoryList(transformed_resource=transform
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Resource_getTransformedResourceInventory</string> </value>
+            <value> <string>Resource_getTransformedResourceInventoryList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
index a6515807f9..aab0109479 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
@@ -597,7 +597,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>Resource_getTransformedResourceInventory</string> </value>
+            <value> <string>Resource_getTransformedResourceInventoryList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskFastInputDialog/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskFastInputDialog/listbox.xml
index 3b85a4d5b7..33dfed9971 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskFastInputDialog/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskFastInputDialog/listbox.xml
@@ -635,7 +635,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>Project_initializeFastInput</string> </value>
+            <value> <string>Project_initializeFastInputTaskList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInputTaskList.xml
similarity index 97%
rename from bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml
rename to bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInputTaskList.xml
index 69cbe77305..73bb2daa21 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInputTaskList.xml
@@ -89,7 +89,7 @@ return l\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Project_initializeFastInput</string> </value>
+            <value> <string>Project_initializeFastInputTaskList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewDocumentFastInputDialog/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewDocumentFastInputDialog/listbox.xml
index 7238f59cda..a0c881bbf5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewDocumentFastInputDialog/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewDocumentFastInputDialog/listbox.xml
@@ -583,7 +583,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>Project_initializeFastInput</string> </value>
+            <value> <string>Project_initializeFastInputTaskList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/Tool/TemplateTool.py b/product/ERP5/Tool/TemplateTool.py
index b1e847f5d4..bd63304fed 100644
--- a/product/ERP5/Tool/TemplateTool.py
+++ b/product/ERP5/Tool/TemplateTool.py
@@ -1398,7 +1398,7 @@ class TemplateTool (BaseTool):
             pass
 
         install_kw = {}
-        for listbox_line in imported_bt5.BusinessTemplate_getModifiedObject():
+        for listbox_line in imported_bt5.BusinessTemplate_getModifiedObjectList():
           item = listbox_line.object_id
           state = listbox_line.object_state
           if state.startswith('Removed'):
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObjectList.xml
similarity index 98%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObjectList.xml
index c3a617ca1b..a84b59a9db 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObjectList.xml
@@ -130,7 +130,7 @@ return object_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>BusinessTemplate_getModifiedObject</string> </value>
+            <value> <string>BusinessTemplate_getModifiedObjectList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml
index 530cd8d3e4..3dfa7f982d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog/listbox.xml
@@ -540,7 +540,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>BusinessTemplate_getModifiedObject</string> </value>
+            <value> <string>BusinessTemplate_getModifiedObjectList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getImportReportFromRequest.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getFromRequestImportReportFieldList.xml
similarity index 96%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getImportReportFromRequest.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getFromRequestImportReportFieldList.xml
index d21bef82f4..f9165d1943 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getImportReportFromRequest.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_getFromRequestImportReportFieldList.xml
@@ -59,7 +59,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CategoryTool_getImportReportFromRequest</string> </value>
+            <value> <string>CategoryTool_getFromRequestImportReportFieldList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportReport/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportReport/listbox.xml
index 38db81e128..8b7bbeee97 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportReport/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportReport/listbox.xml
@@ -531,7 +531,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>CategoryTool_getImportReportFromRequest</string> </value>
+            <value> <string>CategoryTool_getFromRequestImportReportFieldList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.xml
index e1946eb590..be99b6de01 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.xml
@@ -135,8 +135,7 @@ def checkField(folder, form, field):\n
       if a not in (None, "portal_catalog", "searchFolder", "objectValues",\n
                    "contentValues", "ListBox_initializeFastInput"):\n
         if not a.endswith(\'List\'):\n
-          if 0:\n
-            error_message += "%s : %s : %r Bad Naming Convention\\n" % (path, id, a)\n
+          error_message += "%s : %s : %r Bad Naming Convention\\n" % (path, id, a)\n
   return error_message\n
 \n
 def isListBox(field):\n
diff --git a/product/ERP5/tests/testBusinessTemplate.py b/product/ERP5/tests/testBusinessTemplate.py
index 41497358f3..6784d6aa72 100644
--- a/product/ERP5/tests/testBusinessTemplate.py
+++ b/product/ERP5/tests/testBusinessTemplate.py
@@ -2547,7 +2547,7 @@ class BusinessTemplateMixin(TestDeveloperMixin, ERP5TypeTestCase, LogInterceptor
 
   def stepReinstallBusinessTemplate(self, sequence=None, **kw):
     import_bt = sequence.get('current_bt')
-    listbox_object_list = import_bt.BusinessTemplate_getModifiedObject()
+    listbox_object_list = import_bt.BusinessTemplate_getModifiedObjectList()
     install_kw = {}
     for listbox_line in listbox_object_list:
       install_kw[listbox_line.object_id] = listbox_line.choice_item_list[0][1]
@@ -2555,7 +2555,7 @@ class BusinessTemplateMixin(TestDeveloperMixin, ERP5TypeTestCase, LogInterceptor
 
   def stepCheckBeforeReinstall(self, sequence=None, **kw):
     import_bt = sequence.get('current_bt')
-    diff_list = import_bt.BusinessTemplate_getModifiedObject()
+    diff_list = import_bt.BusinessTemplate_getModifiedObjectList()
     self.assertTrue('portal_types/Geek Object/become_geek'
                     in [line.object_id for line in diff_list])
 
diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py
index ad6aa35ca1..ddef7f835b 100644
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
@@ -920,8 +920,8 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
                                      quiet=True):
       template_tool = self.portal.portal_templates
       update_business_templates = os.environ.get('update_business_templates') is not None
-      BusinessTemplate_getModifiedObject = aq_base(
-        getattr(self.portal, 'BusinessTemplate_getModifiedObject', None))
+      BusinessTemplate_getModifiedObjectList = aq_base(
+        getattr(self.portal, 'BusinessTemplate_getModifiedObjectList', None))
 
       # Add some business templates
       for url, bt_title in business_template_list:
@@ -931,7 +931,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
           if update_business_templates:
             if not quiet:
               ZopeTestCase._print('Updating %s business template ... ' % bt_title)
-            if BusinessTemplate_getModifiedObject is not None:
+            if BusinessTemplate_getModifiedObjectList is not None:
               get_install_kw = True
           else:
             continue
@@ -949,7 +949,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
         install_kw = None
         if get_install_kw:
           install_kw = {}
-          listbox_object_list = BusinessTemplate_getModifiedObject.__of__(bt)()
+          listbox_object_list = BusinessTemplate_getModifiedObjectList.__of__(bt)()
           for listbox_line in listbox_object_list:
             install_kw[listbox_line.object_id] = listbox_line.choice_item_list[0][1]
         bt.install(light_install=light_install,
-- 
2.30.9