[FIX] Merge fix in saas1 for the problem that made the server crash when install...

bzr revid: nicolas.vanhoren@openerp.com-20130610144915-0nj8vpk7n84ocj3f
bzr revid: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
bzr revid: nicolas.vanhoren@openerp.com-20130610154514-oee6s4f9g17bx63z

diff --cc addons/web/controllers/main.py
index b7071ef,bfa69cd..8683ef1
--- 1/addons/web/controllers/main.py
--- 2/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@@ -310,9 -308,9 +310,9 @@@ def fs2web(path)
      """convert FS path into web path"""
      return '/'.join(path.split(os.path.sep))
  
- def manifest_glob(extension, addons=None, db=None):
 -def manifest_glob(req, extension, addons=None, db=None, include_remotes=False):
++def manifest_glob(extension, addons=None, db=None, include_remotes=False):
      if addons is None:
 -        addons = module_boot(req, db=db)
 +        addons = module_boot(db=db)
      else:
          addons = addons.split(',')
      r = []
@@@ -324,15 -322,20 +324,20 @@@
          addons_path = os.path.join(manifest['addons_path'], '')[:-1]
          globlist = manifest.get(extension, [])
          for pattern in globlist:
-             for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))):
-                 r.append((path, fs2web(path[len(addons_path):])))
+             if pattern.startswith(('http://', 'https://', '//')):
+                 if include_remotes:
+                     r.append((None, pattern))
+             else:
+                 for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))):
+                     r.append((path, fs2web(path[len(addons_path):])))
      return r
  
 -def manifest_list(req, extension, mods=None, db=None):
 +def manifest_list(extension, mods=None, db=None):
      """ list ressources to load specifying either:
      mods: a comma separated string listing modules
      db: a database name (return all installed modules in that database)
      """
 -    files = manifest_glob(req, extension, addons=mods, db=db, include_remotes=True)
++    files = manifest_glob(extension, addons=mods, db=db, include_remotes=True)
      if not req.debug:
          path = '/web/webclient/' + extension
          if mods is not None:

diff --cc addons/web/http.py
index 67d71ac,17dc3eb..2dc41c8
--- 1/addons/web/http.py
--- 2/addons/web/http.py
+++ b/addons/web/http.py
@@@ -295,9 -299,11 +302,11 @@@ class HttpRequest(WebRequest)
                  akw[key] = value
              else:
                  akw[key] = type(value)
 -        _logger.debug("%s --> %s.%s %r", self.httprequest.method, method.im_class.__name__, method.__name__, akw)
 +        #_logger.debug("%s --> %s.%s %r", self.httprequest.method, method.im_class.__name__, method.__name__, akw)
          try:
 -            r = method(self, **self.params)
 +            r = method(**self.params)
+         except werkzeug.exceptions.HTTPException, e:
+             r = e
          except Exception, e:
              _logger.exception("An exception occured during an http request")
              se = serialize_exception(e)

diff --cc addons/web/static/src/js/chrome.js
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc openerp/addons/base/ir/ir_mail_server.py
Simple merge

diff --cc openerp/addons/base/res/res_company.py
Simple merge

diff --cc openerp/addons/base/res/res_partner.py
Simple merge

diff --cc openerp/addons/base/res/res_users.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge

diff --cc setup.py
index 9f27e20,28c78a9..ff801a9
mode 100755,100644..100644
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py