diff --git a/product/Coramy/skins/coramy_crm/person_search_phone.zsql b/product/Coramy/skins/coramy_crm/person_search_phone.zsql
index 5b7dd041bd9ecc2fb830d219bda561792030daef..bed9c2911929f272530e6389880fe9e56c81e7ea 100755
--- a/product/Coramy/skins/coramy_crm/person_search_phone.zsql
+++ b/product/Coramy/skins/coramy_crm/person_search_phone.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_custom/search_category.zsql b/product/Coramy/skins/coramy_custom/search_category.zsql
index 10b7b6588f7dd1419a06909ae997f5daf3db34ec..539e6e4275265c94d1995689eef9305e4999dad5 100755
--- a/product/Coramy/skins/coramy_custom/search_category.zsql
+++ b/product/Coramy/skins/coramy_custom/search_category.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:Search Category
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_erp5/DeliveryLine_zGetRelatedQuantity.zsql b/product/Coramy/skins/coramy_erp5/DeliveryLine_zGetRelatedQuantity.zsql
index c3b9729799f1c2e578cd6fb928c1d3ae435dffb9..3ef8fb1700d19c4756cd74b0d8358e4503bfd3e6 100755
--- a/product/Coramy/skins/coramy_erp5/DeliveryLine_zGetRelatedQuantity.zsql
+++ b/product/Coramy/skins/coramy_erp5/DeliveryLine_zGetRelatedQuantity.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:10
diff --git a/product/Coramy/skins/coramy_erp5/OrderLine_zGetRelatedQuantity.zsql b/product/Coramy/skins/coramy_erp5/OrderLine_zGetRelatedQuantity.zsql
index c5fb17b8835535b89433c84c4d39e8709cbd6b51..1c601a1b8fb994c63c5074ed4ce963c030499ced 100755
--- a/product/Coramy/skins/coramy_erp5/OrderLine_zGetRelatedQuantity.zsql
+++ b/product/Coramy/skins/coramy_erp5/OrderLine_zGetRelatedQuantity.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_list_method/Delivery_zSearchResource.zsql b/product/Coramy/skins/coramy_list_method/Delivery_zSearchResource.zsql
index 0657b61692a9dd879f2a0cdab460eda0b2ecf602..e83d41e55055e2ebab6760235c3c487bd83b3505 100755
--- a/product/Coramy/skins/coramy_list_method/Delivery_zSearchResource.zsql
+++ b/product/Coramy/skins/coramy_list_method/Delivery_zSearchResource.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ERP5Site_zGetCoramyFutureInventoryList.zsql b/product/Coramy/skins/coramy_mrp/ERP5Site_zGetCoramyFutureInventoryList.zsql
index f90570eff42e7e4dd613aca323aab2d241970665..3442390c786835cf5ed99f73e81f0d4d87c342e9 100755
--- a/product/Coramy/skins/coramy_mrp/ERP5Site_zGetCoramyFutureInventoryList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ERP5Site_zGetCoramyFutureInventoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/InventoryLine_zGetTotal.zsql b/product/Coramy/skins/coramy_mrp/InventoryLine_zGetTotal.zsql
index 6ae7442ad464971d2f32977173f48168ab4ca479..4cda8c0d79e4fdf2d7bbe811de1c5e6ec855a99e 100755
--- a/product/Coramy/skins/coramy_mrp/InventoryLine_zGetTotal.zsql
+++ b/product/Coramy/skins/coramy_mrp/InventoryLine_zGetTotal.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/PieceTissu_zGetInventorized.zsql b/product/Coramy/skins/coramy_mrp/PieceTissu_zGetInventorized.zsql
index aab8840067122b12aef23145eefe99f023b3d6a1..62b70ed717f4f39e69f5b4eb62c0878370210d1f 100755
--- a/product/Coramy/skins/coramy_mrp/PieceTissu_zGetInventorized.zsql
+++ b/product/Coramy/skins/coramy_mrp/PieceTissu_zGetInventorized.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedImmaterialConsumptionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedImmaterialConsumptionList.zsql
index 8a1d8c20858b063009c8a300b5e8609c121b17a6..df55c769350354e8e1c427d9f55d3065fc0a94be 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedImmaterialConsumptionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedImmaterialConsumptionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialConsumptionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialConsumptionList.zsql
index 2b1ab48c671761fdced90a268718ff918ea53ae8..bd43ef04ec0cfc55f46a5f5914f99a52b8ea5ff1 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialConsumptionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialConsumptionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialProductionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialProductionList.zsql
index 50f9501fd281a3ee688e2b1004100cc8fdfbec1f..dd91a5b6068dbefe2e02177581e3c9329a748acb 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialProductionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialProductionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialSourcingList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialSourcingList.zsql
index d4ba4cf25bdb7e1fcb60c0eda785e9470e06aca3..14fc92f7fa5ae73c05e8ee3e479b7787c00c3b3d 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialSourcingList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetAggregatedMaterialSourcingList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionList.zsql
index 4c512ea3ffe67f9859ac7806fba188c19c35e123..c3aefc7517383fef8224ccc46c150c24cd010c7c 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionMovementList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionMovementList.zsql
index e9108eb54c09169d8f426c95368a3f77fc2d3e85..808bf51153776b632ecd88b3ea0d169f688fbe60 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionMovementList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetConsumptionMovementList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetImmaterialConsumptionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetImmaterialConsumptionList.zsql
index 52ed7570246c98bc350dea6f7e2e603939c7e1f1..a5472a9b008b644c324d36b8d38d29442ae0cda2 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetImmaterialConsumptionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetImmaterialConsumptionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialConsumptionList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialConsumptionList.zsql
index 4c512ea3ffe67f9859ac7806fba188c19c35e123..c3aefc7517383fef8224ccc46c150c24cd010c7c 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialConsumptionList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialConsumptionList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialProductionMovementList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialProductionMovementList.zsql
index 2ec0b1d53cac8df3f201e51d2ea1e948e7df0dd8..be46996be74ff9944c4293ae204288882d049087 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialProductionMovementList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialProductionMovementList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialSourcingMovementList.zsql b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialSourcingMovementList.zsql
index bb16e4879ff6529dfc71ef5fbef5d230b72aba30..004aed92ab06e3a705864df4b97abd9fd78759f5 100755
--- a/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialSourcingMovementList.zsql
+++ b/product/Coramy/skins/coramy_mrp/ProductionOrder_zGetMaterialSourcingMovementList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/Resource_zGetChartInventoryList.zsql b/product/Coramy/skins/coramy_mrp/Resource_zGetChartInventoryList.zsql
index a3b385d0ee9f6466132757dfba0164c0662e5956..a0619aa68c82b43b4f556b6f02e8b9adb7577d59 100755
--- a/product/Coramy/skins/coramy_mrp/Resource_zGetChartInventoryList.zsql
+++ b/product/Coramy/skins/coramy_mrp/Resource_zGetChartInventoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/Resource_zGetInventory.zsql b/product/Coramy/skins/coramy_mrp/Resource_zGetInventory.zsql
index c6a81fd757c03113881113ba15bdbb26d5b3a700..18c62cf4c4386165f18494fc58d9ede3793b673a 100755
--- a/product/Coramy/skins/coramy_mrp/Resource_zGetInventory.zsql
+++ b/product/Coramy/skins/coramy_mrp/Resource_zGetInventory.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/Resource_zGetInventoryList.zsql b/product/Coramy/skins/coramy_mrp/Resource_zGetInventoryList.zsql
index 3bf2e4096b9c17ade506aa4707a727e6dcf75e85..cfba5e2f886bbe39c2ffcae9e8ecdcd833bd600e 100755
--- a/product/Coramy/skins/coramy_mrp/Resource_zGetInventoryList.zsql
+++ b/product/Coramy/skins/coramy_mrp/Resource_zGetInventoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/Resource_zGetMovementHistoryList.zsql b/product/Coramy/skins/coramy_mrp/Resource_zGetMovementHistoryList.zsql
index b4589c59c0559730a38cffa7b675bf751f5992bc..a703a9dd6fc87b916a9bb485a6658d503ccaaefb 100755
--- a/product/Coramy/skins/coramy_mrp/Resource_zGetMovementHistoryList.zsql
+++ b/product/Coramy/skins/coramy_mrp/Resource_zGetMovementHistoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/SimulationTool_zGetCoramyFutureInventoryList.zsql b/product/Coramy/skins/coramy_mrp/SimulationTool_zGetCoramyFutureInventoryList.zsql
index 7bfb60a0cac5549c7fd48f07b25dbaf8c33fa677..4d8687dd1d472c1d656894271369a24bf7a37ca4 100755
--- a/product/Coramy/skins/coramy_mrp/SimulationTool_zGetCoramyFutureInventoryList.zsql
+++ b/product/Coramy/skins/coramy_mrp/SimulationTool_zGetCoramyFutureInventoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:100000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_mrp/inventory_MP_view.form b/product/Coramy/skins/coramy_mrp/inventory_MP_view.form
index 98ab5bd3e59475fca07acf7b793089fa69e19ee8..204414fa577bdc5e4d49d7eff53ea4db1f7258c3 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_MP_view.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_MP_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/inventory_PF_view.form b/product/Coramy/skins/coramy_mrp/inventory_PF_view.form
index 30d87ddee66b9b5767c36ce1209ecef802c0f832..36ddd5a7288132e8886ea3ce30cc1417028b31dc 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_PF_view.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_PF_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_PF.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_PF.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/inventory_aggregated_view.form b/product/Coramy/skins/coramy_mrp/inventory_aggregated_view.form
index 207f9a869be19317aaf289866cef446b949812f7..f0c0045675b27e082bff3dd26072c65e3f0666d6 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_aggregated_view.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_aggregated_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/inventory_view.form b/product/Coramy/skins/coramy_mrp/inventory_view.form
index e35b207ed6b40cb455c4a5c39ce1384af0d5e045..e26e5c177f0cbab00acf2a47faa4e200db460ce5 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_view.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/inventory_view2.form b/product/Coramy/skins/coramy_mrp/inventory_view2.form
index bf5a2d59ddcfa0ef06c625c219e5ad7ee484f990..78375b49d73d04c06bc8cab8ae33c5cc6fcd607a 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_view2.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_view2.form
@@ -107,7 +107,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -131,7 +131,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/inventory_view_details.form b/product/Coramy/skins/coramy_mrp/inventory_view_details.form
index 64e987a8eb51b1bdd970c122ecbb6fb5bcebdfcc..934d721809c3bf01bb750d59a4fc07db55357758 100755
--- a/product/Coramy/skins/coramy_mrp/inventory_view_details.form
+++ b/product/Coramy/skins/coramy_mrp/inventory_view_details.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/movement_MP_view.form b/product/Coramy/skins/coramy_mrp/movement_MP_view.form
index 8abdf94851c9dfff58ebbc7e95655a72f9413789..0717f4d16d048d40c5a6cdda2938ff0a0af652c0 100755
--- a/product/Coramy/skins/coramy_mrp/movement_MP_view.form
+++ b/product/Coramy/skins/coramy_mrp/movement_MP_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/movement_PF_view.form b/product/Coramy/skins/coramy_mrp/movement_PF_view.form
index a0b301f87e05af020ba2a0bbed6f2f3ad756c511..f150c0e60fbb29c0e05605b7508b2fdcc9c55c18 100755
--- a/product/Coramy/skins/coramy_mrp/movement_PF_view.form
+++ b/product/Coramy/skins/coramy_mrp/movement_PF_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_PF.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_PF.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_mrp/movement_aggregated_view.form b/product/Coramy/skins/coramy_mrp/movement_aggregated_view.form
index d4107f68557a978e2cc127b5960a3ae54b4ba652..aac35ddfa77ca65baea4fc26ad259e58a2073fb1 100755
--- a/product/Coramy/skins/coramy_mrp/movement_aggregated_view.form
+++ b/product/Coramy/skins/coramy_mrp/movement_aggregated_view.form
@@ -84,7 +84,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Magasin</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.site.Stock_MP.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_pdm/Resource_sqlResourceSupplierSearch.zsql b/product/Coramy/skins/coramy_pdm/Resource_sqlResourceSupplierSearch.zsql
index 3f3aee5cdd37478aa88c60016992ce78ce071ee8..095e9dd6804398150d50afb47270ae1be9a8570e 100755
--- a/product/Coramy/skins/coramy_pdm/Resource_sqlResourceSupplierSearch.zsql
+++ b/product/Coramy/skins/coramy_pdm/Resource_sqlResourceSupplierSearch.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/Resource_sqlSupplierSearch.zsql b/product/Coramy/skins/coramy_pdm/Resource_sqlSupplierSearch.zsql
index e4f7ef48a53641fc80e48bd9ac5f770756b8567c..5a8905b476d75c6fdf0153f57906f94fd8110bf4 100755
--- a/product/Coramy/skins/coramy_pdm/Resource_sqlSupplierSearch.zsql
+++ b/product/Coramy/skins/coramy_pdm/Resource_sqlSupplierSearch.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/gamme_sql_tissu_search.zsql b/product/Coramy/skins/coramy_pdm/gamme_sql_tissu_search.zsql
index 3d2ca5dcf1e2538e6a4b37bc3c6c9afe4978f775..1c02fd7c1c2c6aa21c549f9a0bbd98fa977b870e 100755
--- a/product/Coramy/skins/coramy_pdm/gamme_sql_tissu_search.zsql
+++ b/product/Coramy/skins/coramy_pdm/gamme_sql_tissu_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/modele_sql_default_search.zsql b/product/Coramy/skins/coramy_pdm/modele_sql_default_search.zsql
index 15bac961a7d9eebd68ac47e2e112f41f86b08552..a88813b7b3e9aca8b4c0d7d1885bdc0b8d7e0615 100755
--- a/product/Coramy/skins/coramy_pdm/modele_sql_default_search.zsql
+++ b/product/Coramy/skins/coramy_pdm/modele_sql_default_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/modele_sql_search_destination_reference.zsql b/product/Coramy/skins/coramy_pdm/modele_sql_search_destination_reference.zsql
index bc5b8673bb77391dd0f29b31af86683bbe40f8b3..8151aa336d9b8647008a3fd425f9c411a7a854fb 100755
--- a/product/Coramy/skins/coramy_pdm/modele_sql_search_destination_reference.zsql
+++ b/product/Coramy/skins/coramy_pdm/modele_sql_search_destination_reference.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/modele_sql_search_id.zsql b/product/Coramy/skins/coramy_pdm/modele_sql_search_id.zsql
index f38db587be76285fedaeb3418068058a54b373fe..eff8608aec18d42330ed750af0c370ffdf462bf6 100755
--- a/product/Coramy/skins/coramy_pdm/modele_sql_search_id.zsql
+++ b/product/Coramy/skins/coramy_pdm/modele_sql_search_id.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/modele_sql_search_origine.zsql b/product/Coramy/skins/coramy_pdm/modele_sql_search_origine.zsql
index 49f47b9d3faab5a21426ec3ef8c2ab1d310d5801..deb9e2886084d0c20308e614d645a0678fdcd3cc 100755
--- a/product/Coramy/skins/coramy_pdm/modele_sql_search_origine.zsql
+++ b/product/Coramy/skins/coramy_pdm/modele_sql_search_origine.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/sql_id_search.zsql b/product/Coramy/skins/coramy_pdm/sql_id_search.zsql
index 4a94860539bbf947910b0a35b96ba8360d927fe0..15d4ec455e852bc06083bc3ba81031871449c88a 100755
--- a/product/Coramy/skins/coramy_pdm/sql_id_search.zsql
+++ b/product/Coramy/skins/coramy_pdm/sql_id_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_pdm/transformation_sql_search.zsql b/product/Coramy/skins/coramy_pdm/transformation_sql_search.zsql
index 8603d3be275c2a90942649b8bbce6bb4e61ca1d6..90d44e010dd961d3c056a822ea4b68bcfb341be2 100755
--- a/product/Coramy/skins/coramy_pdm/transformation_sql_search.zsql
+++ b/product/Coramy/skins/coramy_pdm/transformation_sql_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Container_zGetCellList.zsql b/product/Coramy/skins/coramy_trade/Container_zGetCellList.zsql
index bce71f4391d6d6810443938d7d8bd2d8c4c363de..9bef19acc07520b9cbc712d328ac84f0b36bff40 100755
--- a/product/Coramy/skins/coramy_trade/Container_zGetCellList.zsql
+++ b/product/Coramy/skins/coramy_trade/Container_zGetCellList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Container_zGetTotal.zsql b/product/Coramy/skins/coramy_trade/Container_zGetTotal.zsql
index 2458197cb68f403ec773ff13ae2bb2eb5b8cd01b..280b400631703968951f5e44ec3d66bfaad2d7b5 100755
--- a/product/Coramy/skins/coramy_trade/Container_zGetTotal.zsql
+++ b/product/Coramy/skins/coramy_trade/Container_zGetTotal.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/DeliveryCell_zGetContainedTargetQuantity.zsql b/product/Coramy/skins/coramy_trade/DeliveryCell_zGetContainedTargetQuantity.zsql
index e51dc0969a060822d75c053688d248adf84b5ec2..1f9daee47f9fea37a5f78803f6562dc2f0c1b2de 100755
--- a/product/Coramy/skins/coramy_trade/DeliveryCell_zGetContainedTargetQuantity.zsql
+++ b/product/Coramy/skins/coramy_trade/DeliveryCell_zGetContainedTargetQuantity.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/DeliveryCell_zGetItemList.zsql b/product/Coramy/skins/coramy_trade/DeliveryCell_zGetItemList.zsql
index a30d6e841813c11c5cf8d4a4fbc558fefbbbc66e..c66509b49c760a03fc9027f294045c9981c814dd 100755
--- a/product/Coramy/skins/coramy_trade/DeliveryCell_zGetItemList.zsql
+++ b/product/Coramy/skins/coramy_trade/DeliveryCell_zGetItemList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/DeliveryLine_zGetTotal.zsql b/product/Coramy/skins/coramy_trade/DeliveryLine_zGetTotal.zsql
index 6df107da083cebd0603790724b07458aed77c940..21fe2d139cfcae0c0f905a67d7a6002c8e65738b 100755
--- a/product/Coramy/skins/coramy_trade/DeliveryLine_zGetTotal.zsql
+++ b/product/Coramy/skins/coramy_trade/DeliveryLine_zGetTotal.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Delivery_zGetCellList.zsql b/product/Coramy/skins/coramy_trade/Delivery_zGetCellList.zsql
index a5ad6323f3142b81230d446957153e69ba2c4dbf..7cc575b0993f1f4a3a99f91bacb4530f727284c9 100755
--- a/product/Coramy/skins/coramy_trade/Delivery_zGetCellList.zsql
+++ b/product/Coramy/skins/coramy_trade/Delivery_zGetCellList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Delivery_zGetInventoryList.zsql b/product/Coramy/skins/coramy_trade/Delivery_zGetInventoryList.zsql
index b9162566e73c7b9795d095158c12d144b078abd7..5c698d6a19dd0bac464b20faae0c5aa2a1815c2e 100755
--- a/product/Coramy/skins/coramy_trade/Delivery_zGetInventoryList.zsql
+++ b/product/Coramy/skins/coramy_trade/Delivery_zGetInventoryList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Delivery_zGetTotal.zsql b/product/Coramy/skins/coramy_trade/Delivery_zGetTotal.zsql
index 3dfe42fe07eec4f296c1b26fc961d18b182df36b..5327d6716ac7967cdcf8d34bd32da360220b890b 100755
--- a/product/Coramy/skins/coramy_trade/Delivery_zGetTotal.zsql
+++ b/product/Coramy/skins/coramy_trade/Delivery_zGetTotal.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/Movement_zList.zsql b/product/Coramy/skins/coramy_trade/Movement_zList.zsql
index c2f0a16934fd55cd797d4e3af204758eaa9729a1..424f13ecf3968a66ad7c4e105ba919c9b9bb96ca 100755
--- a/product/Coramy/skins/coramy_trade/Movement_zList.zsql
+++ b/product/Coramy/skins/coramy_trade/Movement_zList.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/SalesOrder_importEdiForm.form b/product/Coramy/skins/coramy_trade/SalesOrder_importEdiForm.form
index 893682aab5522c122b1b905de7582bf5dbc65609..e77fcab90d6a127704b039ea465d5a096931c140 100755
--- a/product/Coramy/skins/coramy_trade/SalesOrder_importEdiForm.form
+++ b/product/Coramy/skins/coramy_trade/SalesOrder_importEdiForm.form
@@ -74,8 +74,8 @@
           <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)[1][1]</default>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <default>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)[1][1]</default>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -188,4 +188,4 @@
       </fields>
     </group>
   </groups>
-</form>
\ No newline at end of file
+</form>
diff --git a/product/Coramy/skins/coramy_trade/condition_achat_profil_view.form b/product/Coramy/skins/coramy_trade/condition_achat_profil_view.form
index d6cbd9c634e964f84da392ef923b9e13d44a6a37..582799e849d5d44f82b763435633d1130dcce9f9 100755
--- a/product/Coramy/skins/coramy_trade/condition_achat_profil_view.form
+++ b/product/Coramy/skins/coramy_trade/condition_achat_profil_view.form
@@ -215,7 +215,7 @@
           <title>Pour le compte de</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/condition_achat_sql_search.zsql b/product/Coramy/skins/coramy_trade/condition_achat_sql_search.zsql
index 00d6f5fd44fa4e34a312c104aad736abd37e6647..178b54068631e982ce8017a8b8906de76bd7730f 100755
--- a/product/Coramy/skins/coramy_trade/condition_achat_sql_search.zsql
+++ b/product/Coramy/skins/coramy_trade/condition_achat_sql_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/condition_achat_view.form b/product/Coramy/skins/coramy_trade/condition_achat_view.form
index a13ef07620f1754149b302c3b6d89f24e7d7d942..8ed1b1d9f6a03fe86c12fc36d45453fdf0772b91 100755
--- a/product/Coramy/skins/coramy_trade/condition_achat_view.form
+++ b/product/Coramy/skins/coramy_trade/condition_achat_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -158,7 +158,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/condition_vente_profil_view.form b/product/Coramy/skins/coramy_trade/condition_vente_profil_view.form
index e236e1ad736f42cb672152c1d3338329694cd508..7d7db383404e5d94b5765a2e35b353a28f929932 100755
--- a/product/Coramy/skins/coramy_trade/condition_vente_profil_view.form
+++ b/product/Coramy/skins/coramy_trade/condition_vente_profil_view.form
@@ -59,7 +59,7 @@
           <title>Pour le compte de</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/condition_vente_sql_search.zsql b/product/Coramy/skins/coramy_trade/condition_vente_sql_search.zsql
index 6a39f0ad00b2e9f29d0f450fec99ed5eebb1ad59..9066b02881911be7efa14379ff2587a92a84ff6e 100755
--- a/product/Coramy/skins/coramy_trade/condition_vente_sql_search.zsql
+++ b/product/Coramy/skins/coramy_trade/condition_vente_sql_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/condition_vente_view.form b/product/Coramy/skins/coramy_trade/condition_vente_view.form
index 8c25518c2baacb99e2e76adc373f8a6f42210ed9..55b4f4c7f666ac52d182319da148bafc96daa665 100755
--- a/product/Coramy/skins/coramy_trade/condition_vente_view.form
+++ b/product/Coramy/skins/coramy_trade/condition_vente_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -158,7 +158,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/echantillon_modeliste_sql_worklist.zsql b/product/Coramy/skins/coramy_trade/echantillon_modeliste_sql_worklist.zsql
index 344ffac3b838e0638564350082c89dbdcfb556ad..040959658a61d745fbd23b76da2c8ac98efc13dd 100755
--- a/product/Coramy/skins/coramy_trade/echantillon_modeliste_sql_worklist.zsql
+++ b/product/Coramy/skins/coramy_trade/echantillon_modeliste_sql_worklist.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:2000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/find_delivery_lines_sql_order_list.zsql b/product/Coramy/skins/coramy_trade/find_delivery_lines_sql_order_list.zsql
index 0a65324534ea358614a93e1be59b3c71884d7a4b..a9ccd98fb3ba7757a099fc695deb58b5815910a9 100755
--- a/product/Coramy/skins/coramy_trade/find_delivery_lines_sql_order_list.zsql
+++ b/product/Coramy/skins/coramy_trade/find_delivery_lines_sql_order_list.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:0
 max_cache:0
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/find_order_lines_sql_order_list.zsql b/product/Coramy/skins/coramy_trade/find_order_lines_sql_order_list.zsql
index 80cc05d15058622c5564c570a8a199a60d2b119f..ef5401e3e4e88cddb02a288d09501345bb975428 100755
--- a/product/Coramy/skins/coramy_trade/find_order_lines_sql_order_list.zsql
+++ b/product/Coramy/skins/coramy_trade/find_order_lines_sql_order_list.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:0
 max_cache:0
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/order_sql_totalizer.zsql b/product/Coramy/skins/coramy_trade/order_sql_totalizer.zsql
index 82ff965a327a99b28f81fc6666e41569d00e0fb7..c4c134bd587a8eda0cbaf744e23f3f30e75e956d 100755
--- a/product/Coramy/skins/coramy_trade/order_sql_totalizer.zsql
+++ b/product/Coramy/skins/coramy_trade/order_sql_totalizer.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/purchase_order_view.form b/product/Coramy/skins/coramy_trade/purchase_order_view.form
index b798ce78b5ef5f3681ebb9247c0dfa747fa4df50..dee09e7feebec4d11bffdf75ac4909bc1a89585e 100755
--- a/product/Coramy/skins/coramy_trade/purchase_order_view.form
+++ b/product/Coramy/skins/coramy_trade/purchase_order_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -204,7 +204,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/purchase_packing_list_aggregated_view.form b/product/Coramy/skins/coramy_trade/purchase_packing_list_aggregated_view.form
index 3246d9b8bde8b6c607ca9b140f872ec057af31de..5c9203f77f7170a94326e5a442bc663bd450868f 100755
--- a/product/Coramy/skins/coramy_trade/purchase_packing_list_aggregated_view.form
+++ b/product/Coramy/skins/coramy_trade/purchase_packing_list_aggregated_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/purchase_packing_list_view.form b/product/Coramy/skins/coramy_trade/purchase_packing_list_view.form
index c39284b2e09097526565e022c1bfa250793d0c4a..f967896008e9d0b985b5b734abbd0449f73e964c 100755
--- a/product/Coramy/skins/coramy_trade/purchase_packing_list_view.form
+++ b/product/Coramy/skins/coramy_trade/purchase_packing_list_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/sales_order_view.form b/product/Coramy/skins/coramy_trade/sales_order_view.form
index 22ab19a35f40a24e911eb2dc8b6d270313e138fb..36afacda81f446311061464066e1087f3ef92772 100755
--- a/product/Coramy/skins/coramy_trade/sales_order_view.form
+++ b/product/Coramy/skins/coramy_trade/sales_order_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -280,7 +280,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/sales_packing_list_aggregated_view.form b/product/Coramy/skins/coramy_trade/sales_packing_list_aggregated_view.form
index 827436eac641c52edc7b934956ce459ff8f6cc60..c101c8318bf75758d5668bbc91b31e864ccfa306 100755
--- a/product/Coramy/skins/coramy_trade/sales_packing_list_aggregated_view.form
+++ b/product/Coramy/skins/coramy_trade/sales_packing_list_aggregated_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/sales_packing_list_container_view.form b/product/Coramy/skins/coramy_trade/sales_packing_list_container_view.form
index 68e1cc066d3e5c6c7dfa9e2c47deb1063440c8d7..97bb158ccb8bf236f4b3981b7871c3e8de373f56 100755
--- a/product/Coramy/skins/coramy_trade/sales_packing_list_container_view.form
+++ b/product/Coramy/skins/coramy_trade/sales_packing_list_container_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/sales_packing_list_view.form b/product/Coramy/skins/coramy_trade/sales_packing_list_view.form
index ac8a04235528a45ed7da2760c7e42bc30134b449..403ebf1f3dcab27a04117ff7a8b120c057596f7d 100755
--- a/product/Coramy/skins/coramy_trade/sales_packing_list_view.form
+++ b/product/Coramy/skins/coramy_trade/sales_packing_list_view.form
@@ -53,7 +53,7 @@
           <title>Société</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.group.Coramy.getCategoryChildIdItemList(base=1,display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -108,7 +108,7 @@
           <title>Incoterm</title>
         </values>
         <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(method_name = 'getTitle', start_with_empty_tuple=1)</items>
+          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
diff --git a/product/Coramy/skins/coramy_trade/sample_order_line_search.zsql b/product/Coramy/skins/coramy_trade/sample_order_line_search.zsql
index ef2078435c2bf77fa259aea5639b792b42ff2911..65652f5419d3ab35c098e008d10b26c63b8eb28e 100755
--- a/product/Coramy/skins/coramy_trade/sample_order_line_search.zsql
+++ b/product/Coramy/skins/coramy_trade/sample_order_line_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:300
diff --git a/product/Coramy/skins/coramy_trade/sample_order_sql_modele_search.zsql b/product/Coramy/skins/coramy_trade/sample_order_sql_modele_search.zsql
index e65378ad43d512a9e9f7663ea9c989ed18e14aa1..6aa2fe74a9eab65b11379255178cf04ced29a61d 100755
--- a/product/Coramy/skins/coramy_trade/sample_order_sql_modele_search.zsql
+++ b/product/Coramy/skins/coramy_trade/sample_order_sql_modele_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/samples_delivered.zsql b/product/Coramy/skins/coramy_trade/samples_delivered.zsql
index fb0fe9ab5ab83de20fdbc6799982b2bdec11d8ac..1b80f017519ce78bcb3df687d32460134af7410e 100755
--- a/product/Coramy/skins/coramy_trade/samples_delivered.zsql
+++ b/product/Coramy/skins/coramy_trade/samples_delivered.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:0
 max_cache:0
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/samples_delivery_sql_order_id_search.zsql b/product/Coramy/skins/coramy_trade/samples_delivery_sql_order_id_search.zsql
index b97d46a2088b5f103978abccc96ef7eff143b1b8..145c3710f980a600839094af624ed6785678d149 100755
--- a/product/Coramy/skins/coramy_trade/samples_delivery_sql_order_id_search.zsql
+++ b/product/Coramy/skins/coramy_trade/samples_delivery_sql_order_id_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/samples_ordered.zsql b/product/Coramy/skins/coramy_trade/samples_ordered.zsql
index f282d908e5851dc61ff8ce8fc08a046e36ebd4dd..659d01f1e7791b9e25596f601bf7380bf3565ba1 100755
--- a/product/Coramy/skins/coramy_trade/samples_ordered.zsql
+++ b/product/Coramy/skins/coramy_trade/samples_ordered.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:0
 max_cache:0
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/samples_ordered_delivered.zsql b/product/Coramy/skins/coramy_trade/samples_ordered_delivered.zsql
index d786d5bf4266933c41d3285ba99950308d12123c..8607b48785b40ed91c8c48d5688de22ff37bab56 100755
--- a/product/Coramy/skins/coramy_trade/samples_ordered_delivered.zsql
+++ b/product/Coramy/skins/coramy_trade/samples_ordered_delivered.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:0
 max_cache:0
 cache_time:0
diff --git a/product/Coramy/skins/coramy_trade/samples_packing_list_sql_modele_search.zsql b/product/Coramy/skins/coramy_trade/samples_packing_list_sql_modele_search.zsql
index a20f1a0c8b7b9149732c664c60d56afa2bbd8589..0da2bf52d1331cc1a89ba741096425244fab505d 100755
--- a/product/Coramy/skins/coramy_trade/samples_packing_list_sql_modele_search.zsql
+++ b/product/Coramy/skins/coramy_trade/samples_packing_list_sql_modele_search.zsql
@@ -1,6 +1,6 @@
 <dtml-comment>
 title:
-connection_id:MySQL
+connection_id:erp5_sql_connection
 max_rows:1000
 max_cache:100
 cache_time:0