[MERGE] Forward-port saas-3 up to 9b55532

diff --cc addons/web/controllers/main.py
Simple merge

diff --cc openerp/tools/translate.py
index 10584e4,e7a7c62..d9294bf
--- 1/openerp/tools/translate.py
--- 2/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@@ -778,7 -785,26 +785,6 @@@ def trans_generate(lang, modules, cr)
          if model_obj._sql_constraints:
              push_local_constraints(module, model_obj, 'sql_constraints')
  
- 
 -    def get_module_paths():
 -        # default addons path (base)
 -        def_path = os.path.abspath(os.path.join(config.config['root_path'], 'addons'))
 -        mod_paths = { def_path }
 -        ad_paths = map(lambda m: os.path.abspath(m.strip()),config.config['addons_path'].split(','))
 -        for adp in ad_paths:
 -            mod_paths.add(adp)
 -            if not os.path.isabs(adp):
 -                mod_paths.add(adp)
 -            elif adp != def_path and adp.startswith(def_path):
 -                mod_paths.add(adp[len(def_path)+1:])
 -        return mod_paths
 -
 -    def get_module_from_path(path, mod_paths):
 -        for mp in mod_paths:
 -            if path.startswith(mp) and (os.path.dirname(path) != mp):
 -                path = path[len(mp)+1:]
 -                return path.split(os.path.sep)[0]
 -        return 'base'   # files that are not in a module are considered as being in 'base' module
 -
      modobj = registry['ir.module.module']
      installed_modids = modobj.search(cr, uid, [('state', '=', 'installed')])
      installed_modules = map(lambda m: m['name'], modobj.read(cr, uid, installed_modids, ['name']))