multiple_catalog: getSQLCatalog should give the catalog from preference

And, comment out the part where we try to get the acl_user in preference tool.
It is completely unncessary \review needed

product/ERP5Catalog/Tool/ERP5CatalogTool.py

@@ -155,6 +155,11 @@ class ERP5CatalogTool(BaseTool, CMFCore_CatalogTool):
       Get current ERP5 Catalog
       """
       if id is None:
+        # Better to get preferred catalog and use it is as the default catalog
+        # instead of getting default catalog from properties
+        catalog_path = self.portal_preferences.getPreferredCatalog()
+        catalog = self.unrestrictedTraverse(catalog_path)
+        return catalog
         if not self.default_erp5_catalog_id:
           id_list = self.getERP5CatalogIdList()
           if len(id_list) > 0:

product/ERP5Form/PreferenceTool.py

@@ -149,10 +149,10 @@ class PreferenceTool(BaseTool):
       # reset a security manager without any proxy role or unrestricted method,
       # wich affects the catalog search that we do to find applicable
       # preferences.
-      actual_user = acl_users.getUserById(user.getId())
-      if actual_user is not None:
-        newSecurityManager(None, actual_user.__of__(acl_users))
-      tv_key = 'PreferenceTool._getSortedPreferenceList/%s/%s' % (user.getId(),
+      #actual_user = acl_users.getUser(str(user))
+      #if actual_user is not None:
+      #  newSecurityManager(None, actual_user.__of__(acl_users))
+      tv_key = 'PreferenceTool._getSortedPreferenceList/%s/%s' % (user,
                                                                   sql_catalog_id)
       if tv.get(tv_key, None) is None:
         prefs = []