diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py
index 7e3111c0260a272b1c63ca48e1aeda530575c9ac..4b88b25f98ce94a4165b3f0d5faffaabe3f3bdde 100644
--- a/product/ERP5/ERP5Site.py
+++ b/product/ERP5/ERP5Site.py
@@ -860,11 +860,14 @@ class ERP5Generator(PortalGenerator):
             addSQLConnection('cmf_activity_sql_connection', 'CMF Activity SQL Server Connection', p.cmf_activity_sql_connection_string)
         elif p.cmf_activity_sql_connection_type == 'Z Gadfly':
           pass
-        # Create default methods in Catalog XXX
+        
         portal_catalog = getToolByName(p, 'portal_catalog')
         if not portal_catalog.getSQLCatalog('erp5_mysql') and not update:
-            # Clear Catalog
-            portal_catalog.manage_catalogClear()
+          # Add a default SQL Catalog
+          addSQLCatalog = portal_catalog.manage_addProduct['ZSQLCatalog']\
+                                          .manage_addSQLCatalog
+          addSQLCatalog('erp5_mysql', '')
+          portal_catalog.default_sql_catalog_id = 'erp5_mysql'
 
         # Add ERP5Form Tools
         addTool = p.manage_addProduct['ERP5Form'].manage_addTool
@@ -879,14 +882,12 @@ class ERP5Generator(PortalGenerator):
           addTool('ERP5 Synchronizations', None)
 
         # Add Message Catalog
-        #if 'Localizer' in p.objectIds():
-          #p._delObject('Localizer') # Why delete it, we should keep for ERP5/CPS
         if not 'Localizer' in p.objectIds():
-          #p._delObject('Localizer') # Why delete it, we should keep for ERP5/CPS
           addLocalizer = p.manage_addProduct['Localizer'].manage_addLocalizer
           addLocalizer('', ('en',))
         localizer = getToolByName(p, 'Localizer')
-        addMessageCatalog = localizer.manage_addProduct['Localizer'].manage_addMessageCatalog
+        addMessageCatalog = localizer.manage_addProduct['Localizer']\
+                                          .manage_addMessageCatalog
         if 'erp5_ui' not in localizer.objectIds():
           if 'default' in localizer.objectIds():
             localizer.manage_delObjects('default')
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_catalog/erp5_mysql.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_catalog/erp5_mysql.xml
deleted file mode 100644
index 952326a0e1e1eeedc7206efca71938ed9579c6e1..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_catalog/erp5_mysql.xml
+++ /dev/null
@@ -1,866 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ZSQLCatalog.SQLCatalog</string>
-          <string>Catalog</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>filter_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>erp5_mysql</string> </value>
-        </item>
-        <item>
-            <key> <string>indexes</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>names</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>schema</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_clear_reserved</string> </key>
-            <value> <unicode>z_clear_reserved</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_full_text_search_keys</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_keyword_search_keys</string> </key>
-            <value>
-              <tuple>
-                <unicode>catalog.description</unicode>
-                <unicode>catalog.title</unicode>
-                <unicode>description</unicode>
-                <unicode>title</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_multivalue_keys</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_object_list</string> </key>
-            <value>
-              <tuple>
-                <unicode>z_catalog_delivery_list</unicode>
-                <unicode>z_catalog_item_list</unicode>
-                <unicode>z_catalog_movement_category_list</unicode>
-                <unicode>z_catalog_movement_list</unicode>
-                <unicode>z_catalog_non_movement_category_list</unicode>
-                <unicode>z_catalog_object_list</unicode>
-                <unicode>z_catalog_predicate_category_list</unicode>
-                <unicode>z_catalog_predicate_list</unicode>
-                <unicode>z_catalog_roles_and_users_list</unicode>
-                <unicode>z_catalog_stock_list</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_paths</string> </key>
-            <value> <unicode>z_catalog_paths</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_produce_reserved</string> </key>
-            <value> <unicode>z_produce_reserved_uid_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_related_keys</string> </key>
-            <value>
-              <tuple>
-                <unicode>allowedRolesAndUsers | roles_and_users/allowedRolesAndUsers/z_related_security</unicode>
-                <unicode>base_category_id | category,catalog/id/z_related_base_category_id</unicode>
-                <unicode>deliveryLineType | movement,catalog/portal_type/z_related_uid_or_parent_uid</unicode>
-                <unicode>destination_section_id | category,catalog/id/z_related_default_destination_section</unicode>
-                <unicode>default_destination_section_id | category,catalog/id/z_related_default_destination_section</unicode>
-                <unicode>source_id | category,catalog/id/z_related_default_source</unicode>
-                <unicode>default_source_id | category,catalog/id/z_related_default_source</unicode>
-                <unicode>destination_id | category,catalog/id/z_related_default_destination</unicode>
-                <unicode>default_destination_id | category,catalog/id/z_related_default_destination</unicode>
-                <unicode>source_section_id | category,catalog/id/z_related_default_source_section</unicode>
-                <unicode>default_source_section_id | category,catalog/id/z_related_default_source_section</unicode>
-                <unicode>destination_section_title | category,catalog/title/z_related_default_destination_section</unicode>
-                <unicode>default_destination_section_title | category,catalog/title/z_related_default_destination_section</unicode>
-                <unicode>source_title | category,catalog/title/z_related_default_source</unicode>
-                <unicode>default_source_title | category,catalog/title/z_related_default_source</unicode>
-                <unicode>destination_title | category,catalog/title/z_related_default_destination</unicode>
-                <unicode>default_destination_title | category,catalog/title/z_related_default_destination</unicode>
-                <unicode>source_section_title | category,catalog/title/z_related_default_source_section</unicode>
-                <unicode>default_source_section_title | category,catalog/title/z_related_default_source_section</unicode>
-                <unicode>explanation_portal_type | movement,catalog/portal_type/z_related_explanation</unicode>
-                <unicode>predicate_uid | predicate/uid/z_related_predicate</unicode>
-                <unicode>resourceType | movement,catalog/portal_type/z_related_resource</unicode>
-                <unicode>stock_mirror_section_category_uid | category/category_uid/z_related_mirror_section_uid_from_stock</unicode>
-                <unicode>stock_node_category_uid | category/category_uid/z_related_node_uid_from_stock</unicode>
-                <unicode>stock_payment_category_uid | category/category_uid/z_related_payment_uid_from_stock</unicode>
-                <unicode>stock_resource_category_uid | category/category_uid/z_related_resource_uid_from_stock</unicode>
-                <unicode>stock_section_category_uid | category/category_uid/z_related_section_uid_from_stock</unicode>
-                <unicode>subordination_title | category,catalog/title/z_related_subordination</unicode>
-                <unicode>translated_portal_type | translation/translated_message/z_related_translated_portal_type</unicode>
-                <unicode>translated_simulation_state | translation/translated_message/z_related_translated_simulation_state_title</unicode>
-                <unicode>translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state</unicode>
-                <unicode>variationCategory | category/category_uid/z_related_uid</unicode>
-                <unicode>parent_specialise_portal_type | category,catalog/portal_type/z_related_parent_specialise</unicode>
-                <unicode>grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent</unicode>
-                <unicode>grand_parent_simulation_state | catalog,catalog/simulation_state/z_related_grand_parent</unicode>
-                <unicode>career_skill_title | category,catalog,catalog/title/z_related_career_skill</unicode>
-                <unicode>career_skill_id | category,catalog,catalog/id/z_related_career_skill</unicode>
-                <unicode>translated_validation_state | translation/translated_message/z_related_translated_validation_state</unicode>
-                <unicode>translated_validation_state_title | translation/translated_message/z_related_translated_validation_state</unicode>
-                <unicode>translated_opportunity_state | translation/translated_message/z_related_translated_opportunity_state</unicode>
-                <unicode>translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state</unicode>
-                <unicode>item_resource_category_uid | category/category_uid/z_related_resource_uid_from_item</unicode>
-                <unicode>item_section_category_uid | category/category_uid/z_related_section_uid_from_item</unicode>
-                <unicode>item_node_category_uid | category/category_uid/z_related_node_uid_from_item</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_request_keys</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_reserve_uid</string> </key>
-            <value> <unicode>z_reserve_uid</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_schema</string> </key>
-            <value> <unicode>z_show_columns</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_tables</string> </key>
-            <value> <unicode>z_show_tables</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_topic_search_keys</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_catalog_translation_list</string> </key>
-            <value> <unicode>z_catalog_translation_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_clear_catalog</string> </key>
-            <value>
-              <tuple>
-                <unicode>z0_drop_catalog</unicode>
-                <unicode>z0_drop_category</unicode>
-                <unicode>z0_drop_compatibility</unicode>
-                <unicode>z0_drop_delivery</unicode>
-                <unicode>z0_drop_item</unicode>
-                <unicode>z0_drop_movement</unicode>
-                <unicode>z0_drop_predicate</unicode>
-                <unicode>z0_drop_predicate_category</unicode>
-                <unicode>z0_drop_record</unicode>
-                <unicode>z0_drop_roles_and_users</unicode>
-                <unicode>z0_drop_stock</unicode>
-                <unicode>z0_drop_subject</unicode>
-                <unicode>z0_drop_translation</unicode>
-                <unicode>z_create_catalog</unicode>
-                <unicode>z_create_category</unicode>
-                <unicode>z_create_compatibility</unicode>
-                <unicode>z_create_delivery</unicode>
-                <unicode>z_create_item</unicode>
-                <unicode>z_create_movement</unicode>
-                <unicode>z_create_predicate</unicode>
-                <unicode>z_create_predicate_category</unicode>
-                <unicode>z_create_record</unicode>
-                <unicode>z_create_roles_and_users</unicode>
-                <unicode>z_create_stock</unicode>
-                <unicode>z_create_subject</unicode>
-                <unicode>z_create_translation</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_count_results</string> </key>
-            <value> <unicode>z_count_results</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_delete_recorded_object_list</string> </key>
-            <value> <unicode>z_delete_recorded_object_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_delete_translation_list</string> </key>
-            <value> <unicode>z_delete_translation_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_getitem_by_path</string> </key>
-            <value> <unicode>z_getitem_by_path</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_getitem_by_uid</string> </key>
-            <value> <unicode>z_getitem_by_uid</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_read_recorded_object_list</string> </key>
-            <value> <unicode>z_read_recorded_object_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_record_object_list</string> </key>
-            <value> <unicode>z_record_object_list</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_search_result_keys</string> </key>
-            <value>
-              <tuple>
-                <unicode>catalog.path</unicode>
-                <unicode>catalog.uid</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_search_results</string> </key>
-            <value> <unicode>z_search_results</unicode> </value>
-        </item>
-        <item>
-            <key> <string>sql_search_tables</string> </key>
-            <value>
-              <tuple>
-                <unicode>catalog</unicode>
-                <unicode>category</unicode>
-                <unicode>delivery</unicode>
-                <unicode>movement</unicode>
-                <unicode>predicate</unicode>
-                <unicode>predicate_category</unicode>
-                <unicode>roles_and_users</unicode>
-                <unicode>stock</unicode>
-                <unicode>item</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_uncatalog_object</string> </key>
-            <value>
-              <tuple>
-                <unicode>z0_uncatalog_category</unicode>
-                <unicode>z0_uncatalog_item</unicode>
-                <unicode>z0_uncatalog_movement</unicode>
-                <unicode>z0_uncatalog_predicate</unicode>
-                <unicode>z0_uncatalog_predicate_category</unicode>
-                <unicode>z0_uncatalog_stock</unicode>
-                <unicode>z_uncatalog_delivery</unicode>
-                <unicode>z_uncatalog_object</unicode>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>sql_unique_values</string> </key>
-            <value> <unicode>z_unique_values</unicode> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <unicode>ERP5/MySQL</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <unicode>z_catalog_delivery_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_item_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_movement_category_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_movement_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_non_movement_category_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_predicate_category_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_predicate_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <unicode>z_catalog_stock_list</unicode> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isDelivery</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isMovement</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isMovement</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="6" aka="AAAAAAAAAAY=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isMovement</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="7" aka="AAAAAAAAAAc=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: not isMovement</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="8" aka="AAAAAAAAAAg=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isPredicate</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="9" aka="AAAAAAAAAAk=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isPredicate</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="10" aka="AAAAAAAAAAo=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>expression</string> </key>
-                    <value> <unicode>python: isMovement</unicode> </value>
-                </item>
-                <item>
-                    <key> <string>expression_instance</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>filtered</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>type</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="11" aka="AAAAAAAAAAs=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isDelivery</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="12" aka="AAAAAAAAAAw=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isMovement</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="13" aka="AAAAAAAAAA0=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isMovement</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="14" aka="AAAAAAAAAA4=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isMovement</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="15" aka="AAAAAAAAAA8=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: not isMovement</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="16" aka="AAAAAAAAABA=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isPredicate</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="17" aka="AAAAAAAAABE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isPredicate</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="18" aka="AAAAAAAAABI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <unicode>python: isMovement</unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_path_list
index 5cf215c67db2645058e5e1f74a6ef7e8873801c0..ab58f2fecc54aa5bff9c727a26548503472a300b 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_path_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_path_list
@@ -1,2 +1 @@
-portal_catalog/erp5_mysql
 portal_preferences/default_site_preference
\ No newline at end of file