[merge]trunk.

bzr revid: vme@tinyerp.com-20120821120122-7lgndirsyuaop6mi

addons/web/common/http.py

@@ -330,16 +330,32 @@ def httprequest(f):
     return http_handler
 
 #----------------------------------------------------------
-# OpenERP Web werkzeug Session Managment wraped using with
+# OpenERP Web Controller registration with a metaclass
+#----------------------------------------------------------
+addons_module = {}
+addons_manifest = {}
+controllers_class = []
+controllers_object = {}
+controllers_path = {}
+
+class ControllerType(type):
+    def __init__(cls, name, bases, attrs):
+        super(ControllerType, cls).__init__(name, bases, attrs)
+        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
+
+class Controller(object):
+    __metaclass__ = ControllerType
+
+#----------------------------------------------------------
+# OpenERP Web Session context manager
 #----------------------------------------------------------
 STORES = {}
 
 @contextlib.contextmanager
-def session_context(request, storage_path, session_cookie='sessionid'):
+def session_context(request, storage_path, session_cookie='httpsessionid'):
     session_store, session_lock = STORES.get(storage_path, (None, None))
     if not session_store:
-        session_store = werkzeug.contrib.sessions.FilesystemSessionStore(
+        session_store = werkzeug.contrib.sessions.FilesystemSessionStore( storage_path)
-            storage_path)
         session_lock = threading.Lock()
         STORES[storage_path] = session_store, session_lock
 
@@ -402,22 +418,8 @@ def session_context(request, storage_path, session_cookie='sessionid'):
             session_store.save(request.session)
 
 #----------------------------------------------------------
-# OpenERP Web Module/Controller Loading and URL Routing
+# OpenERP Web WSGI Application
 #----------------------------------------------------------
-addons_module = {}
-addons_manifest = {}
-controllers_class = []
-controllers_object = {}
-controllers_path = {}
-
-class ControllerType(type):
-    def __init__(cls, name, bases, attrs):
-        super(ControllerType, cls).__init__(name, bases, attrs)
-        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
-
-class Controller(object):
-    __metaclass__ = ControllerType
-
 class DisableCacheMiddleware(object):
     def __init__(self, app):
         self.app = app
@@ -464,12 +466,12 @@ class Root(object):
 
         if not hasattr(self.config, 'connector'):
             if self.config.backend == 'local':
-                self.config.connector = LocalConnector()
+                self.config.connector = session.LocalConnector()
             else:
                 self.config.connector = openerplib.get_connector(
                     hostname=self.config.server_host, port=self.config.server_port)
 
-        self.session_cookie = 'sessionid'
+        self.httpsession_cookie = 'httpsessionid'
         self.addons = {}
 
         static_dirs = self._load_addons(openerp_addons_namespace)
@@ -504,7 +506,7 @@ class Root(object):
         if not handler:
             response = werkzeug.exceptions.NotFound()
         else:
-            with session_context(request, self.session_storage, self.session_cookie) as session:
+            with session_context(request, self.session_storage, self.httpsession_cookie) as session:
                 result = handler( request, self.config)
 
                 if isinstance(result, basestring):
@@ -514,7 +516,7 @@ class Root(object):
                     response = result
 
                 if hasattr(response, 'set_cookie'):
-                    response.set_cookie(self.session_cookie, session.sid)
+                    response.set_cookie(self.httpsession_cookie, session.sid)
 
         return response(environ, start_response)
 
@@ -563,61 +565,13 @@ class Root(object):
             while ps:
                 c = controllers_path.get(ps)
                 if c:
-                    m = getattr(c, meth)
+                    m = getattr(c, meth, None)
-                    if getattr(m, 'exposed', False):
+                    if m and getattr(m, 'exposed', False):
                         _logger.debug("Dispatching to %s %s %s", ps, c, meth)
                         return m
                 ps, _slash, meth = ps.rpartition('/')
+                if not ps and meth:
+                    ps = '/'
         return None
 
-class LibException(Exception):
+# vim:et:ts=4:sw=4:
-    """ Base of all client lib exceptions """
-    def __init__(self,code=None,message=None):
-        self.code = code
-        self.message = message
-
-class ApplicationError(LibException):
-    """ maps to code: 1, server side: Exception or openerp.exceptions.DeferredException"""
-
-class Warning(LibException):
-    """ maps to code: 2, server side: openerp.exceptions.Warning"""
-
-class AccessError(LibException):
-    """ maps to code: 3, server side:  openerp.exceptions.AccessError"""
-
-class AccessDenied(LibException):
-    """ maps to code: 4, server side: openerp.exceptions.AccessDenied"""
-
-
-class LocalConnector(openerplib.Connector):
-    """
-    A type of connector that uses the XMLRPC protocol.
-    """
-    PROTOCOL = 'local'
-
-    def __init__(self):
-        pass
-
-    def send(self, service_name, method, *args):
-        import openerp
-        import traceback
-        import xmlrpclib
-        code_string = "warning -- %s\n\n%s"
-        try:
-            return openerp.netsvc.dispatch_rpc(service_name, method, args)
-        except openerp.osv.osv.except_osv, e:
-        # TODO change the except to raise LibException instead of their emulated xmlrpc fault
-            raise xmlrpclib.Fault(code_string % (e.name, e.value), '')
-        except openerp.exceptions.Warning, e:
-            raise xmlrpclib.Fault(code_string % ("Warning", e), '')
-        except openerp.exceptions.AccessError, e:
-            raise xmlrpclib.Fault(code_string % ("AccessError", e), '')
-        except openerp.exceptions.AccessDenied, e:
-            raise xmlrpclib.Fault('AccessDenied', str(e))
-        except openerp.exceptions.DeferredException, e:
-            formatted_info = "".join(traceback.format_exception(*e.traceback))
-            raise xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
-        except Exception, e:
-            formatted_info = "".join(traceback.format_exception(*(sys.exc_info())))
-            raise xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
-

addons/web/common/session.py

@@ -4,11 +4,67 @@ import babel
 import dateutil.relativedelta
 import logging
 import time
+import sys
+
 import openerplib
 
 from . import nonliterals
 
 _logger = logging.getLogger(__name__)
+
+#----------------------------------------------------------
+# openerplib local connector
+#----------------------------------------------------------
+class LibException(Exception):
+    """ Base of all client lib exceptions """
+    def __init__(self,code=None,message=None):
+        self.code = code
+        self.message = message
+
+class ApplicationError(LibException):
+    """ maps to code: 1, server side: Exception or openerp.exceptions.DeferredException"""
+
+class Warning(LibException):
+    """ maps to code: 2, server side: openerp.exceptions.Warning"""
+
+class AccessError(LibException):
+    """ maps to code: 3, server side:  openerp.exceptions.AccessError"""
+
+class AccessDenied(LibException):
+    """ maps to code: 4, server side: openerp.exceptions.AccessDenied"""
+
+class LocalConnector(openerplib.Connector):
+    """
+    A type of connector that uses the XMLRPC protocol.
+    """
+    PROTOCOL = 'local'
+
+    def __init__(self):
+        pass
+
+    def send(self, service_name, method, *args):
+        import openerp
+        import traceback
+        import xmlrpclib
+        code_string = "warning -- %s\n\n%s"
+        try:
+            return openerp.netsvc.dispatch_rpc(service_name, method, args)
+        except openerp.osv.osv.except_osv, e:
+        # TODO change the except to raise LibException instead of their emulated xmlrpc fault
+            raise xmlrpclib.Fault(code_string % (e.name, e.value), '')
+        except openerp.exceptions.Warning, e:
+            raise xmlrpclib.Fault(code_string % ("Warning", e), '')
+        except openerp.exceptions.AccessError, e:
+            raise xmlrpclib.Fault(code_string % ("AccessError", e), '')
+        except openerp.exceptions.AccessDenied, e:
+            raise xmlrpclib.Fault('AccessDenied', str(e))
+        except openerp.exceptions.DeferredException, e:
+            formatted_info = "".join(traceback.format_exception(*e.traceback))
+            raise xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
+        except Exception, e:
+            formatted_info = "".join(traceback.format_exception(*(sys.exc_info())))
+            raise xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
+
 #----------------------------------------------------------
 # OpenERPSession RPC openerp backend access
 #----------------------------------------------------------
@@ -216,3 +272,5 @@ class OpenERPSession(object):
         cdomain = nonliterals.CompoundDomain(domain)
         cdomain.session = self
         return cdomain.evaluate(context or {})
+
+# vim:et:ts=4:sw=4:

addons/web/controllers/main.py

@@ -34,6 +34,50 @@ openerpweb = common.http
 # OpenERP Web helpers
 #----------------------------------------------------------
 
+def rjsmin(script):
+    """ Minify js with a clever regex.
+    Taken from http://opensource.perlig.de/rjsmin
+    Apache License, Version 2.0 """
+    def subber(match):
+        """ Substitution callback """
+        groups = match.groups()
+        return (
+            groups[0] or
+            groups[1] or
+            groups[2] or
+            groups[3] or
+            (groups[4] and '\n') or
+            (groups[5] and ' ') or
+            (groups[6] and ' ') or
+            (groups[7] and ' ') or
+            ''
+        )
+
+    result = re.sub(
+        r'([^\047"/\000-\040]+)|((?:(?:\047[^\047\\\r\n]*(?:\\(?:[^\r\n]|\r?'
+        r'\n|\r)[^\047\\\r\n]*)*\047)|(?:"[^"\\\r\n]*(?:\\(?:[^\r\n]|\r?\n|'
+        r'\r)[^"\\\r\n]*)*"))[^\047"/\000-\040]*)|(?:(?<=[(,=:\[!&|?{};\r\n]'
+        r')(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/'
+        r'))*((?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n]*'
+        r'(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/\\\[\r\n]*)*/)[^\047"/\000-\040]*'
+        r'))|(?:(?<=[\000-#%-,./:-@\[-^`{-~-]return)(?:[\000-\011\013\014\01'
+        r'6-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*((?:/(?![\r\n/*])[^/'
+        r'\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]'
+        r'*)*\]))[^/\\\[\r\n]*)*/)[^\047"/\000-\040]*))|(?<=[^\000-!#%&(*,./'
+        r':-@\[\\^`{|~])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/'
+        r'*][^*]*\*+)*/))*(?:((?:(?://[^\r\n]*)?[\r\n]))(?:[\000-\011\013\01'
+        r'4\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000-\040"#'
+        r'%-\047)*,./:-@\\-^`|-~])|(?<=[^\000-#%-,./:-@\[-^`{-~-])((?:[\000-'
+        r'\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=[^'
+        r'\000-#%-,./:-@\[-^`{-~-])|(?<=\+)((?:[\000-\011\013\014\016-\040]|'
+        r'(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=\+)|(?<=-)((?:[\000-\011\0'
+        r'13\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=-)|(?:[\0'
+        r'00-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))+|(?:'
+        r'(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*'
+        r']*\*+(?:[^/*][^*]*\*+)*/))*)+', subber, '\n%s\n' % script
+    ).strip()
+    return result
+
 def sass2scss(src):
     # Validated by diff -u of sass2scss against:
     # sass-convert -F sass -T scss openerp.sass openerp.scss
@@ -86,6 +130,7 @@ def sass2scss(src):
     return write(sass)
 
 def db_list(req):
+    dbs = []
     proxy = req.session.proxy("db")
     dbs = proxy.list()
     h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
@@ -182,14 +227,19 @@ def module_installed_bypass_session(dbname):
     return sorted_modules
 
 def module_boot(req):
-    dbs = db_list(req)
     serverside = []
     dbside = []
     for i in req.config.server_wide_modules:
         if i in openerpweb.addons_manifest:
             serverside.append(i)
+    # if only one db load every module at boot
+    dbs = []
+    try:
+        dbs = db_list(req)
+    except xmlrpclib.Fault:
+        # ignore access denied
+        pass
     if len(dbs) == 1:
-        # if only one db load every module at boot
         dbside = module_installed_bypass_session(dbs[0])
         dbside = [i for i in dbside if i not in serverside]
     addons = serverside + dbside
@@ -250,6 +300,11 @@ def concat_files(file_list, reader=None, intersperse=""):
     files_concat = intersperse.join(files_content)
     return files_concat, checksum.hexdigest()
 
+def concat_js(file_list):
+    content, checksum = concat_files(file_list, intersperse=';')
+    content = rjsmin(content)
+    return content, checksum 
+
 def manifest_glob(req, addons, key):
     if addons is None:
         addons = module_boot(req)
@@ -322,6 +377,9 @@ def make_conditional(req, response, last_modified=None, etag=None):
 
 def login_and_redirect(req, db, login, key, redirect_url='/'):
     req.session.authenticate(db, login, key, {})
+    return set_cookie_and_redirect(req, redirect_url)
+
+def set_cookie_and_redirect(req, redirect_url):
     redirect = werkzeug.utils.redirect(redirect_url, 303)
     redirect.autocorrect_location_header = False
     cookie_val = urllib2.quote(simplejson.dumps(req.session_id))
@@ -582,7 +640,7 @@ class WebClient(openerpweb.Controller):
         if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
 
-        content, checksum = concat_files(files, intersperse=';')
+        content, checksum = concat_js(files)
 
         return make_conditional(
             req, req.make_response(content, [('Content-Type', 'application/javascript')]),
@@ -802,9 +860,8 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        loaded = module_boot(req)
+        # return all installed modules. Web client is smart enough to not load a module twice
-        modules = module_installed(req)
+        return module_installed(req)
-        return [module for module in modules if module not in loaded]
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,
@@ -1133,6 +1190,15 @@ class DataSet(openerpweb.Controller):
     def exec_workflow(self, req, model, id, signal):
         return req.session.exec_workflow(model, id, signal)
 
+    @openerpweb.jsonrequest
+    def resequence(self, req, model, ids):
+        m = req.session.model(model)
+        if not len(m.fields_get(['sequence'])):
+            return False
+        for i in range(len(ids)):
+            m.write([ids[i]], { 'sequence': i })
+        return True
+
 class DataGroup(openerpweb.Controller):
     _cp_path = "/web/group"
     @openerpweb.jsonrequest

addons/web/i18n/ar.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/bg.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/bn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/bs.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/ca.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/cs.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web

addons/web/i18n/da.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/de.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/en_AU.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/en_GB.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/es.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/es_CL.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/es_CR.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 "Language: es\n"
 
 #. openerp-web

addons/web/i18n/es_EC.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/et.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/eu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/fi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/fr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/fr_CA.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/gl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/gu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/hi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/hr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/hu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/id.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/it.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/ja.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/ka.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/mk.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/mn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/nb.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/nl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/nl_BE.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/pl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/pt.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/pt_BR.po

@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: 2012-07-30 00:28+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/ro.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/ru.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/sk.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/sl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/sq.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/sr@latin.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/sv.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/tr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/uk.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/zh_CN.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/i18n/zh_TW.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176

addons/web/static/lib/backbone/backbone.js

@@ -1,4 +1,4 @@
-//     Backbone.js 0.9.1
+//     Backbone.js 0.9.2
 
 //     (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
 //     Backbone may be freely distributed under the MIT license.
@@ -32,7 +32,7 @@
   }
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.9.1';
+  Backbone.VERSION = '0.9.2';
 
   // Require Underscore, if we're on the server, and it's not already present.
   var _ = root._;
@@ -71,6 +71,9 @@
   // Backbone.Events
   // -----------------
 
+  // Regular expression used to split event strings
+  var eventSplitter = /\s+/;
+
   // A module that can be mixed in to *any object* in order to provide it with
   // custom events. You may bind with `on` or remove with `off` callback functions
   // to an event; trigger`-ing an event fires all callbacks in succession.
@@ -80,89 +83,110 @@
   //     object.on('expand', function(){ alert('expanded'); });
   //     object.trigger('expand');
   //
-  Backbone.Events = {
+  var Events = Backbone.Events = {
 
-    // Bind an event, specified by a string name, `ev`, to a `callback`
+    // Bind one or more space separated events, `events`, to a `callback`
     // function. Passing `"all"` will bind the callback to all events fired.
     on: function(events, callback, context) {
-      var ev;
+
-      events = events.split(/\s+/);
+      var calls, event, node, tail, list;
-      var calls = this._callbacks || (this._callbacks = {});
+      if (!callback) return this;
-      while (ev = events.shift()) {
+      events = events.split(eventSplitter);
-        // Create an immutable callback list, allowing traversal during
+      calls = this._callbacks || (this._callbacks = {});
-        // modification.  The tail is an empty object that will always be used
+
-        // as the next node.
+      // Create an immutable callback list, allowing traversal during
-        var list  = calls[ev] || (calls[ev] = {});
+      // modification.  The tail is an empty object that will always be used
-        var tail = list.tail || (list.tail = list.next = {});
+      // as the next node.
-        tail.callback = callback;
+      while (event = events.shift()) {
-        tail.context = context;
+        list = calls[event];
-        list.tail = tail.next = {};
+        node = list ? list.tail : {};
+        node.next = tail = {};
+        node.context = context;
+        node.callback = callback;
+        calls[event] = {tail: tail, next: list ? list.next : node};
       }
+
       return this;
     },
 
     // Remove one or many callbacks. If `context` is null, removes all callbacks
     // with that function. If `callback` is null, removes all callbacks for the
-    // event. If `ev` is null, removes all bound callbacks for all events.
+    // event. If `events` is null, removes all bound callbacks for all events.
     off: function(events, callback, context) {
-      var ev, calls, node;
+      var event, calls, node, tail, cb, ctx;
-      if (!events) {
+
+      // No events, or removing *all* events.
+      if (!(calls = this._callbacks)) return;
+      if (!(events || callback || context)) {
         delete this._callbacks;
-      } else if (calls = this._callbacks) {
+        return this;
-        events = events.split(/\s+/);
+      }
-        while (ev = events.shift()) {
+
-          node = calls[ev];
+      // Loop through the listed events and contexts, splicing them out of the
-          delete calls[ev];
+      // linked list of callbacks if appropriate.
-          if (!callback || !node) continue;
+      events = events ? events.split(eventSplitter) : _.keys(calls);
-          // Create a new list, omitting the indicated event/context pairs.
+      while (event = events.shift()) {
-          while ((node = node.next) && node.next) {
+        node = calls[event];
-            if (node.callback === callback &&
+        delete calls[event];
-              (!context || node.context === context)) continue;
+        if (!node || !(callback || context)) continue;
-            this.on(ev, node.callback, node.context);
+        // Create a new list, omitting the indicated callbacks.
+        tail = node.tail;
+        while ((node = node.next) !== tail) {
+          cb = node.callback;
+          ctx = node.context;
+          if ((callback && cb !== callback) || (context && ctx !== context)) {
+            this.on(event, cb, ctx);
           }
         }
       }
+
       return this;
     },
 
-    // Trigger an event, firing all bound callbacks. Callbacks are passed the
+    // Trigger one or many events, firing all bound callbacks. Callbacks are
-    // same arguments as `trigger` is, apart from the event name.
+    // passed the same arguments as `trigger` is, apart from the event name
-    // Listening for `"all"` passes the true event name as the first argument.
+    // (unless you're listening on `"all"`, which will cause your callback to
+    // receive the true name of the event as the first argument).
     trigger: function(events) {
       var event, node, calls, tail, args, all, rest;
       if (!(calls = this._callbacks)) return this;
-      all = calls['all'];
+      all = calls.all;
-      (events = events.split(/\s+/)).push(null);
+      events = events.split(eventSplitter);
-      // Save references to the current heads & tails.
-      while (event = events.shift()) {
-        if (all) events.push({next: all.next, tail: all.tail, event: event});
-        if (!(node = calls[event])) continue;
-        events.push({next: node.next, tail: node.tail});
-      }
-      // Traverse each list, stopping when the saved tail is reached.
       rest = slice.call(arguments, 1);
-      while (node = events.pop()) {
+
-        tail = node.tail;
+      // For each event, walk through the linked list of callbacks twice,
-        args = node.event ? [node.event].concat(rest) : rest;
+      // first to trigger the event, then to trigger any `"all"` callbacks.
-        while ((node = node.next) !== tail) {
+      while (event = events.shift()) {
-          node.callback.apply(node.context || this, args);
+        if (node = calls[event]) {
+          tail = node.tail;
+          while ((node = node.next) !== tail) {
+            node.callback.apply(node.context || this, rest);
+          }
+        }
+        if (node = all) {
+          tail = node.tail;
+          args = [event].concat(rest);
+          while ((node = node.next) !== tail) {
+            node.callback.apply(node.context || this, args);
+          }
         }
       }
+
       return this;
     }
 
   };
 
   // Aliases for backwards compatibility.
-  Backbone.Events.bind   = Backbone.Events.on;
+  Events.bind   = Events.on;
-  Backbone.Events.unbind = Backbone.Events.off;
+  Events.unbind = Events.off;
 
   // Backbone.Model
   // --------------
 
   // Create a new model, with defined attributes. A client id (`cid`)
   // is automatically generated and assigned for you.
-  Backbone.Model = function(attributes, options) {
+  var Model = Backbone.Model = function(attributes, options) {
     var defaults;
     attributes || (attributes = {});
     if (options && options.parse) attributes = this.parse(attributes);
@@ -173,16 +197,31 @@
     this.attributes = {};
     this._escapedAttributes = {};
     this.cid = _.uniqueId('c');
-    if (!this.set(attributes, {silent: true})) {
+    this.changed = {};
-      throw new Error("Can't create an invalid model");
+    this._silent = {};
-    }
+    this._pending = {};
-    delete this._changed;
+    this.set(attributes, {silent: true});
+    // Reset change tracking.
+    this.changed = {};
+    this._silent = {};
+    this._pending = {};
     this._previousAttributes = _.clone(this.attributes);
     this.initialize.apply(this, arguments);
   };
 
   // Attach all inheritable methods to the Model prototype.
-  _.extend(Backbone.Model.prototype, Backbone.Events, {
+  _.extend(Model.prototype, Events, {
+
+    // A hash of attributes whose current and previous value differ.
+    changed: null,
+
+    // A hash of attributes that have silently changed since the last time
+    // `change` was called.  Will become pending attributes on the next call.
+    _silent: null,
+
+    // A hash of attributes that have changed since the last `'change'` event
+    // began.
+    _pending: null,
 
     // The default name for the JSON `id` attribute is `"id"`. MongoDB and
     // CouchDB users may want to set this to `"_id"`.
@@ -193,7 +232,7 @@
     initialize: function(){},
 
     // Return a copy of the model's `attributes` object.
-    toJSON: function() {
+    toJSON: function(options) {
       return _.clone(this.attributes);
     },
 
@@ -206,20 +245,22 @@
     escape: function(attr) {
       var html;
       if (html = this._escapedAttributes[attr]) return html;
-      var val = this.attributes[attr];
+      var val = this.get(attr);
       return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val);
     },
 
     // Returns `true` if the attribute contains a value that is not null
     // or undefined.
     has: function(attr) {
-      return this.attributes[attr] != null;
+      return this.get(attr) != null;
     },
 
     // Set a hash of model attributes on the object, firing `"change"` unless
     // you choose to silence it.
     set: function(key, value, options) {
       var attrs, attr, val;
+
+      // Handle both `"key", value` and `{key: value}` -style arguments.
       if (_.isObject(key) || key == null) {
         attrs = key;
         options = value;
@@ -231,7 +272,7 @@
       // Extract attributes and options.
       options || (options = {});
       if (!attrs) return this;
-      if (attrs instanceof Backbone.Model) attrs = attrs.attributes;
+      if (attrs instanceof Model) attrs = attrs.attributes;
       if (options.unset) for (attr in attrs) attrs[attr] = void 0;
 
       // Run validation.
@@ -240,33 +281,37 @@
       // Check for changes of `id`.
       if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
 
+      var changes = options.changes = {};
       var now = this.attributes;
       var escaped = this._escapedAttributes;
       var prev = this._previousAttributes || {};
-      var alreadySetting = this._setting;
-      this._changed || (this._changed = {});
-      this._setting = true;
 
-      // Update attributes.
+      // For each `set` attribute...
       for (attr in attrs) {
         val = attrs[attr];
-        if (!_.isEqual(now[attr], val)) delete escaped[attr];
+
-        options.unset ? delete now[attr] : now[attr] = val;
+        // If the new and current value differ, record the change.
-        if (this._changing && !_.isEqual(this._changed[attr], val)) {
+        if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
-          this.trigger('change:' + attr, this, val, options);
+          delete escaped[attr];
-          this._moreChanges = true;
+          (options.silent ? this._silent : changes)[attr] = true;
         }
-        delete this._changed[attr];
+
+        // Update or delete the current value.
+        options.unset ? delete now[attr] : now[attr] = val;
+
+        // If the new and previous value differ, record the change.  If not,
+        // then remove changes for this attribute.
         if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) {
-          this._changed[attr] = val;
+          this.changed[attr] = val;
+          if (!options.silent) this._pending[attr] = true;
+        } else {
+          delete this.changed[attr];
+          delete this._pending[attr];
         }
       }
 
-      // Fire the `"change"` events, if the model has been changed.
+      // Fire the `"change"` events.
-      if (!alreadySetting) {
+      if (!options.silent) this.change(options);
-        if (!options.silent && this.hasChanged()) this.change(options);
-        this._setting = false;
-      }
       return this;
     },
 
@@ -304,6 +349,8 @@
     // state will be `set` again.
     save: function(key, value, options) {
       var attrs, current;
+
+      // Handle both `("key", value)` and `({key: value})` -style calls.
       if (_.isObject(key) || key == null) {
         attrs = key;
         options = value;
@@ -311,18 +358,30 @@
         attrs = {};
         attrs[key] = value;
       }
-
       options = options ? _.clone(options) : {};
-      if (options.wait) current = _.clone(this.attributes);
+
+      // If we're "wait"-ing to set changed attributes, validate early.
+      if (options.wait) {
+        if (!this._validate(attrs, options)) return false;
+        current = _.clone(this.attributes);
+      }
+
+      // Regular saves `set` attributes before persisting to the server.
       var silentOptions = _.extend({}, options, {silent: true});
       if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
         return false;
       }
+
+      // After a successful server-side save, the client is (optionally)
+      // updated with the server-side state.
       var model = this;
       var success = options.success;
       options.success = function(resp, status, xhr) {
         var serverAttrs = model.parse(resp, xhr);
-        if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs);
+        if (options.wait) {
+          delete options.wait;
+          serverAttrs = _.extend(attrs || {}, serverAttrs);
+        }
         if (!model.set(serverAttrs, options)) return false;
         if (success) {
           success(model, resp);
@@ -330,6 +389,8 @@
           model.trigger('sync', model, resp, options);
         }
       };
+
+      // Finish configuring and sending the Ajax request.
       options.error = Backbone.wrapError(options.error, model, options);
       var method = this.isNew() ? 'create' : 'update';
       var xhr = (this.sync || Backbone.sync).call(this, method, this, options);
@@ -349,7 +410,11 @@
         model.trigger('destroy', model, model.collection, options);
       };
 
-      if (this.isNew()) return triggerDestroy();
+      if (this.isNew()) {
+        triggerDestroy();
+        return false;
+      }
+
       options.success = function(resp) {
         if (options.wait) triggerDestroy();
         if (success) {
@@ -358,6 +423,7 @@
           model.trigger('sync', model, resp, options);
         }
       };
+
       options.error = Backbone.wrapError(options.error, model, options);
       var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options);
       if (!options.wait) triggerDestroy();
@@ -368,7 +434,7 @@
     // using Backbone's restful methods, override this to change the endpoint
     // that will be called.
     url: function() {
-      var base = getValue(this.collection, 'url') || getValue(this, 'urlRoot') || urlError();
+      var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError();
       if (this.isNew()) return base;
       return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
     },
@@ -393,18 +459,33 @@
     // a `"change:attribute"` event for each changed attribute.
     // Calling this will cause all objects observing the model to update.
     change: function(options) {
-      if (this._changing || !this.hasChanged()) return this;
+      options || (options = {});
+      var changing = this._changing;
       this._changing = true;
-      this._moreChanges = true;
+
-      for (var attr in this._changed) {
+      // Silent changes become pending changes.
-        this.trigger('change:' + attr, this, this._changed[attr], options);
+      for (var attr in this._silent) this._pending[attr] = true;
+
+      // Silent changes are triggered.
+      var changes = _.extend({}, options.changes, this._silent);
+      this._silent = {};
+      for (var attr in changes) {
+        this.trigger('change:' + attr, this, this.get(attr), options);
       }
-      while (this._moreChanges) {
+      if (changing) return this;
-        this._moreChanges = false;
+
+      // Continue firing `"change"` events while there are pending changes.
+      while (!_.isEmpty(this._pending)) {
+        this._pending = {};
         this.trigger('change', this, options);
+        // Pending and silent changes still remain.
+        for (var attr in this.changed) {
+          if (this._pending[attr] || this._silent[attr]) continue;
+          delete this.changed[attr];
+        }
+        this._previousAttributes = _.clone(this.attributes);
       }
-      this._previousAttributes = _.clone(this.attributes);
+
-      delete this._changed;
       this._changing = false;
       return this;
     },
@@ -412,8 +493,8 @@
     // Determine if the model has changed since the last `"change"` event.
     // If you specify an attribute name, determine if that attribute has changed.
     hasChanged: function(attr) {
-      if (!arguments.length) return !_.isEmpty(this._changed);
+      if (!arguments.length) return !_.isEmpty(this.changed);
-      return this._changed && _.has(this._changed, attr);
+      return _.has(this.changed, attr);
     },
 
     // Return an object containing all the attributes that have changed, or
@@ -423,7 +504,7 @@
     // You can also pass an attributes object to diff against the model,
     // determining if there *would be* a change.
     changedAttributes: function(diff) {
-      if (!diff) return this.hasChanged() ? _.clone(this._changed) : false;
+      if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
       var val, changed = false, old = this._previousAttributes;
       for (var attr in diff) {
         if (_.isEqual(old[attr], (val = diff[attr]))) continue;
@@ -451,9 +532,9 @@
       return !this.validate(this.attributes);
     },
 
-    // Run validation against a set of incoming attributes, returning `true`
+    // Run validation against the next complete set of model attributes,
-    // if all is well. If a specific `error` callback has been passed,
+    // returning `true` if all is well. If a specific `error` callback has
-    // call that instead of firing the general `"error"` event.
+    // been passed, call that instead of firing the general `"error"` event.
     _validate: function(attrs, options) {
       if (options.silent || !this.validate) return true;
       attrs = _.extend({}, this.attributes, attrs);
@@ -475,8 +556,9 @@
   // Provides a standard collection class for our sets of models, ordered
   // or unordered. If a `comparator` is specified, the Collection will maintain
   // its models in sort order, as they're added and removed.
-  Backbone.Collection = function(models, options) {
+  var Collection = Backbone.Collection = function(models, options) {
     options || (options = {});
+    if (options.model) this.model = options.model;
     if (options.comparator) this.comparator = options.comparator;
     this._reset();
     this.initialize.apply(this, arguments);
@@ -484,11 +566,11 @@
   };
 
   // Define the Collection's inheritable methods.
-  _.extend(Backbone.Collection.prototype, Backbone.Events, {
+  _.extend(Collection.prototype, Events, {
 
     // The default model for a collection is just a **Backbone.Model**.
     // This should be overridden in most cases.
-    model: Backbone.Model,
+    model: Model,
 
     // Initialize is an empty function by default. Override it with your own
     // initialization logic.
@@ -496,14 +578,14 @@
 
     // The JSON representation of a Collection is an array of the
     // models' attributes.
-    toJSON: function() {
+    toJSON: function(options) {
-      return this.map(function(model){ return model.toJSON(); });
+      return this.map(function(model){ return model.toJSON(options); });
     },
 
     // Add a model, or list of models to the set. Pass **silent** to avoid
     // firing the `add` event for every new model.
     add: function(models, options) {
-      var i, index, length, model, cid, id, cids = {}, ids = {};
+      var i, index, length, model, cid, id, cids = {}, ids = {}, dups = [];
       options || (options = {});
       models = _.isArray(models) ? models.slice() : [models];
 
@@ -513,16 +595,24 @@
         if (!(model = models[i] = this._prepareModel(models[i], options))) {
           throw new Error("Can't add an invalid model to a collection");
         }
-        if (cids[cid = model.cid] || this._byCid[cid] ||
+        cid = model.cid;
-          (((id = model.id) != null) && (ids[id] || this._byId[id]))) {
+        id = model.id;
-          throw new Error("Can't add the same model to a collection twice");
+        if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) {
+          dups.push(i);
+          continue;
         }
         cids[cid] = ids[id] = model;
       }
 
+      // Remove duplicates.
+      i = dups.length;
+      while (i--) {
+        models.splice(dups[i], 1);
+      }
+
       // Listen to added models' events, and index models for lookup by
       // `id` and by `cid`.
-      for (i = 0; i < length; i++) {
+      for (i = 0, length = models.length; i < length; i++) {
         (model = models[i]).on('all', this._onModelEvent, this);
         this._byCid[model.cid] = model;
         if (model.id != null) this._byId[model.id] = model;
@@ -566,9 +656,37 @@
       return this;
     },
 
+    // Add a model to the end of the collection.
+    push: function(model, options) {
+      model = this._prepareModel(model, options);
+      this.add(model, options);
+      return model;
+    },
+
+    // Remove a model from the end of the collection.
+    pop: function(options) {
+      var model = this.at(this.length - 1);
+      this.remove(model, options);
+      return model;
+    },
+
+    // Add a model to the beginning of the collection.
+    unshift: function(model, options) {
+      model = this._prepareModel(model, options);
+      this.add(model, _.extend({at: 0}, options));
+      return model;
+    },
+
+    // Remove a model from the beginning of the collection.
+    shift: function(options) {
+      var model = this.at(0);
+      this.remove(model, options);
+      return model;
+    },
+
     // Get a model from the set by id.
     get: function(id) {
-      if (id == null) return null;
+      if (id == null) return void 0;
       return this._byId[id.id != null ? id.id : id];
     },
 
@@ -582,6 +700,17 @@
       return this.models[index];
     },
 
+    // Return models with matching attributes. Useful for simple cases of `filter`.
+    where: function(attrs) {
+      if (_.isEmpty(attrs)) return [];
+      return this.filter(function(model) {
+        for (var key in attrs) {
+          if (attrs[key] !== model.get(key)) return false;
+        }
+        return true;
+      });
+    },
+
     // Force the collection to re-sort itself. You don't need to call this under
     // normal circumstances, as the set will maintain sort order as each item
     // is added.
@@ -613,7 +742,7 @@
         this._removeReference(this.models[i]);
       }
       this._reset();
-      this.add(models, {silent: true, parse: options.parse});
+      this.add(models, _.extend({silent: true}, options));
       if (!options.silent) this.trigger('reset', this, options);
       return this;
     },
@@ -679,7 +808,8 @@
 
     // Prepare a model or hash of attributes to be added to this collection.
     _prepareModel: function(model, options) {
-      if (!(model instanceof Backbone.Model)) {
+      options || (options = {});
+      if (!(model instanceof Model)) {
         var attrs = model;
         options.collection = this;
         model = new this.model(attrs, options);
@@ -702,12 +832,12 @@
     // Sets need to update their indexes when models change ids. All other
     // events simply proxy through. "add" and "remove" events that originate
     // in other collections are ignored.
-    _onModelEvent: function(ev, model, collection, options) {
+    _onModelEvent: function(event, model, collection, options) {
-      if ((ev == 'add' || ev == 'remove') && collection != this) return;
+      if ((event == 'add' || event == 'remove') && collection != this) return;
-      if (ev == 'destroy') {
+      if (event == 'destroy') {
         this.remove(model, options);
       }
-      if (model && ev === 'change:' + model.idAttribute) {
+      if (model && event === 'change:' + model.idAttribute) {
         delete this._byId[model.previous(model.idAttribute)];
         this._byId[model.id] = model;
       }
@@ -725,7 +855,7 @@
 
   // Mix in each Underscore method as a proxy to `Collection#models`.
   _.each(methods, function(method) {
-    Backbone.Collection.prototype[method] = function() {
+    Collection.prototype[method] = function() {
       return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
     };
   });
@@ -735,7 +865,7 @@
 
   // Routers map faux-URLs to actions, and fire events when routes are
   // matched. Creating a new one sets its `routes` hash, if not set statically.
-  Backbone.Router = function(options) {
+  var Router = Backbone.Router = function(options) {
     options || (options = {});
     if (options.routes) this.routes = options.routes;
     this._bindRoutes();
@@ -749,7 +879,7 @@
   var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
 
   // Set up all inheritable **Backbone.Router** properties and methods.
-  _.extend(Backbone.Router.prototype, Backbone.Events, {
+  _.extend(Router.prototype, Events, {
 
     // Initialize is an empty function by default. Override it with your own
     // initialization logic.
@@ -762,7 +892,7 @@
     //     });
     //
     route: function(route, name, callback) {
-      Backbone.history || (Backbone.history = new Backbone.History);
+      Backbone.history || (Backbone.history = new History);
       if (!_.isRegExp(route)) route = this._routeToRegExp(route);
       if (!callback) callback = this[name];
       Backbone.history.route(route, _.bind(function(fragment) {
@@ -815,7 +945,7 @@
 
   // Handles cross-browser history management, based on URL fragments. If the
   // browser does not support `onhashchange`, falls back to polling.
-  Backbone.History = function() {
+  var History = Backbone.History = function() {
     this.handlers = [];
     _.bindAll(this, 'checkUrl');
   };
@@ -827,15 +957,23 @@
   var isExplorer = /msie [\w.]+/;
 
   // Has the history handling already been started?
-  var historyStarted = false;
+  History.started = false;
 
   // Set up all inheritable **Backbone.History** properties and methods.
-  _.extend(Backbone.History.prototype, Backbone.Events, {
+  _.extend(History.prototype, Events, {
 
     // The default interval to poll for hash changes, if necessary, is
     // twenty times a second.
     interval: 50,
 
+    // Gets the true hash value. Cannot use location.hash directly due to bug
+    // in Firefox where location.hash will always be decoded.
+    getHash: function(windowOverride) {
+      var loc = windowOverride ? windowOverride.location : window.location;
+      var match = loc.href.match(/#(.*)$/);
+      return match ? match[1] : '';
+    },
+
     // Get the cross-browser normalized URL fragment, either from the URL,
     // the hash, or the override.
     getFragment: function(fragment, forcePushState) {
@@ -845,10 +983,9 @@
           var search = window.location.search;
           if (search) fragment += search;
         } else {
-          fragment = window.location.hash;
+          fragment = this.getHash();
         }
       }
-      fragment = decodeURIComponent(fragment);
       if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length);
       return fragment.replace(routeStripper, '');
     },
@@ -856,10 +993,11 @@
     // Start the hash change handling, returning `true` if the current URL matches
     // an existing route, and `false` otherwise.
     start: function(options) {
+      if (History.started) throw new Error("Backbone.history has already been started");
+      History.started = true;
 
       // Figure out the initial configuration. Do we need an iframe?
       // Is pushState desired ... is it available?
-      if (historyStarted) throw new Error("Backbone.history has already been started");
       this.options          = _.extend({}, {root: '/'}, this.options, options);
       this._wantsHashChange = this.options.hashChange !== false;
       this._wantsPushState  = !!this.options.pushState;
@@ -867,6 +1005,7 @@
       var fragment          = this.getFragment();
       var docMode           = document.documentMode;
       var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+
       if (oldIE) {
         this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
         this.navigate(fragment);
@@ -885,7 +1024,6 @@
       // Determine if we need to change the base url, for a pushState link
       // opened by a non-pushState browser.
       this.fragment = fragment;
-      historyStarted = true;
       var loc = window.location;
       var atRoot  = loc.pathname == this.options.root;
 
@@ -900,7 +1038,7 @@
       // Or if we've started out with a hash-based route, but we're currently
       // in a browser where it could be `pushState`-based instead...
       } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
-        this.fragment = loc.hash.replace(routeStripper, '');
+        this.fragment = this.getHash().replace(routeStripper, '');
         window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
       }
 
@@ -914,7 +1052,7 @@
     stop: function() {
       $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
       clearInterval(this._checkUrlInterval);
-      historyStarted = false;
+      History.started = false;
     },
 
     // Add a route to be tested when the fragment changes. Routes added later
@@ -927,10 +1065,10 @@
     // calls `loadUrl`, normalizing across the hidden iframe.
     checkUrl: function(e) {
       var current = this.getFragment();
-      if (current == this.fragment && this.iframe) current = this.getFragment(this.iframe.location.hash);
+      if (current == this.fragment && this.iframe) current = this.getFragment(this.getHash(this.iframe));
-      if (current == this.fragment || current == decodeURIComponent(this.fragment)) return false;
+      if (current == this.fragment) return false;
       if (this.iframe) this.navigate(current);
-      this.loadUrl() || this.loadUrl(window.location.hash);
+      this.loadUrl() || this.loadUrl(this.getHash());
     },
 
     // Attempt to load the current URL fragment. If a route succeeds with a
@@ -953,12 +1091,12 @@
     //
     // The options object can contain `trigger: true` if you wish to have the
     // route callback be fired (not usually desirable), or `replace: true`, if
-    // you which to modify the current URL without adding an entry to the history.
+    // you wish to modify the current URL without adding an entry to the history.
     navigate: function(fragment, options) {
-      if (!historyStarted) return false;
+      if (!History.started) return false;
       if (!options || options === true) options = {trigger: options};
       var frag = (fragment || '').replace(routeStripper, '');
-      if (this.fragment == frag || this.fragment == decodeURIComponent(frag)) return;
+      if (this.fragment == frag) return;
 
       // If pushState is available, we use it to set the fragment as a real URL.
       if (this._hasPushState) {
@@ -971,7 +1109,7 @@
       } else if (this._wantsHashChange) {
         this.fragment = frag;
         this._updateHash(window.location, frag, options.replace);
-        if (this.iframe && (frag != this.getFragment(this.iframe.location.hash))) {
+        if (this.iframe && (frag != this.getFragment(this.getHash(this.iframe)))) {
           // Opening and closing the iframe tricks IE7 and earlier to push a history entry on hash-tag change.
           // When replace is true, we don't want this.
           if(!options.replace) this.iframe.document.open().close();
@@ -1002,7 +1140,7 @@
 
   // Creating a Backbone.View creates its initial element outside of the DOM,
   // if an existing element is not provided...
-  Backbone.View = function(options) {
+  var View = Backbone.View = function(options) {
     this.cid = _.uniqueId('view');
     this._configure(options || {});
     this._ensureElement();
@@ -1011,13 +1149,13 @@
   };
 
   // Cached regex to split keys for `delegate`.
-  var eventSplitter = /^(\S+)\s*(.*)$/;
+  var delegateEventSplitter = /^(\S+)\s*(.*)$/;
 
   // List of view options to be merged as properties.
   var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
 
   // Set up all inheritable **Backbone.View** properties and methods.
-  _.extend(Backbone.View.prototype, Backbone.Events, {
+  _.extend(View.prototype, Events, {
 
     // The default `tagName` of a View's element is `"div"`.
     tagName: 'div',
@@ -1061,7 +1199,8 @@
     // Change the view's element (`this.el` property), including event
     // re-delegation.
     setElement: function(element, delegate) {
-      this.$el = $(element);
+      if (this.$el) this.undelegateEvents();
+      this.$el = (element instanceof $) ? element : $(element);
       this.el = this.$el[0];
       if (delegate !== false) this.delegateEvents();
       return this;
@@ -1088,8 +1227,8 @@
       for (var key in events) {
         var method = events[key];
         if (!_.isFunction(method)) method = this[events[key]];
-        if (!method) throw new Error('Event "' + events[key] + '" does not exist');
+        if (!method) throw new Error('Method "' + events[key] + '" does not exist');
-        var match = key.match(eventSplitter);
+        var match = key.match(delegateEventSplitter);
         var eventName = match[1], selector = match[2];
         method = _.bind(method, this);
         eventName += '.delegateEvents' + this.cid;
@@ -1145,8 +1284,7 @@
   };
 
   // Set up inheritance for the model, collection, and view.
-  Backbone.Model.extend = Backbone.Collection.extend =
+  Model.extend = Collection.extend = Router.extend = View.extend = extend;
-    Backbone.Router.extend = Backbone.View.extend = extend;
 
   // Backbone.sync
   // -------------
@@ -1177,6 +1315,9 @@
   Backbone.sync = function(method, model, options) {
     var type = methodMap[method];
 
+    // Default options, unless specified.
+    options || (options = {});
+
     // Default JSON-request options.
     var params = {type: type, dataType: 'json'};
 

addons/web/static/src/css/base.css

@@ -64,6 +64,11 @@
   }
 }
 
+@media print {
+  .oe_topbar, .oe_leftbar, .oe_loading {
+    display: none !important;
+  }
+}
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -76,9 +81,10 @@
   color: #4c4c4c;
   font-size: 13px;
   background: white;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -159,7 +165,7 @@
 .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid #ababab;
-  color: #404040;
+  color: #4c4c4c;
   margin: 0;
   padding: 3px 12px;
   font-size: 13px;
@@ -233,7 +239,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -335,7 +341,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -546,7 +552,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -577,9 +583,12 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
+.openerp .oe_tags.oe_inline {
+  min-width: 250px;
+}
 .openerp .oe_tags .text-wrap {
   width: 100% !important;
 }
@@ -1003,7 +1012,7 @@
 .openerp .oe_topbar {
   width: 100%;
   height: 31px;
-  border-top: solid 1px #d3d3d3;
+  border-top: solid 1px lightgrey;
   background-color: #646060;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
   background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -1028,14 +1037,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_topbar .oe_topbar_item .oe_active {
-  background: #303030;
-  font-weight: bold;
-  color: white;
-  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-}
 .openerp .oe_topbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
@@ -1146,10 +1147,10 @@
   padding: 0;
   margin: 0;
 }
-.openerp .oe_menu li {
+.openerp .oe_menu > li {
   float: left;
 }
-.openerp .oe_menu a {
+.openerp .oe_menu > li > a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -1158,14 +1159,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp .oe_menu a:hover {
+.openerp .oe_menu > li > a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_menu .oe_active {
+.openerp .oe_menu > li > .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
@@ -1176,7 +1177,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1198,11 +1199,11 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1218,9 +1219,9 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
+  background: #7c7bad;
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
-  border-bottom: 1px solid lightGray;
+  border-bottom: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1231,7 +1232,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1239,7 +1240,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1269,7 +1270,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1294,6 +1295,9 @@
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td {
   padding-top: 0;
 }
+.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:first-child td {
+  padding-top: 8px;
+}
 .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar {
   margin: 0px auto;
   text-align: center;
@@ -1307,7 +1311,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1666,7 +1670,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -1920,12 +1924,11 @@
   width: auto;
 }
 .openerp .oe_form_nosheet {
-  margin: 8px;
+  margin: 16px;
 }
 .openerp .oe_form_nosheet > header {
-  margin-top: -20px;
+  margin: -16px -16px 0 -16px;
-  margin-left: -20px;
+  padding: 8px;
-  margin-right: -20px;
 }
 .openerp .oe_form header {
   position: relative;
@@ -1937,8 +1940,6 @@
   background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
   background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
   background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-  padding: 0 8px;
-  line-height: 30px;
 }
 .openerp .oe_form header ul {
   display: inline-block;
@@ -1948,9 +1949,10 @@
   min-width: 650px;
   max-width: 860px;
   margin: 0 auto;
+  padding: 16px 0 48px;
 }
 .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
-  margin: 25px 0 10px 0;
+  margin: 12px 0 8px 0;
 }
 .openerp .oe_form div.oe_form_configuration p {
   color: #aaaaaa;
@@ -1959,141 +1961,141 @@
 .openerp .oe_form div.oe_form_configuration label {
   min-width: 150px;
 }
-.openerp ul.oe_form_steps {
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
-  height: 30px;
+  padding: 2px 0;
-  padding: 0;
-  margin: 0;
-  text-shadow: 0 1px 1px white;
 }
-.openerp ul.oe_form_steps img {
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
-  vertical-align: top;
+  padding: 1px 0;
-  margin-left: 8px;
 }
-.openerp ul.oe_form_steps li {
+.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
-  border-right: none;
+  display: inline-block;
-  padding: 0;
+  padding-right: 18px;
-  margin: 0;
-  float: left;
-  vertical-align: top;
-  height: 30px;
-  padding: 0 0 0 12px;
 }
-.openerp ul.oe_form_steps li:first-child {
+.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li {
+  display: inline-block;
+  margin-right: -20px;
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
+}
+.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label {
   border-left: 1px solid #cacaca;
+  padding-left: 14px;
 }
-.openerp ul.oe_form_steps li:last-child {
+.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child {
-  margin-right: 12px;
-  padding-right: 12px;
   border-right: 1px solid #cacaca;
 }
-.openerp ul.oe_form_steps li a {
+.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label {
+  padding-right: 14px;
+}
+.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow {
+  display: none;
+}
+.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label {
   color: #4c4c4c;
-}
+  text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
-.openerp ul.oe_form_steps li a:hover {
+  padding: 7px;
-  color: black;
+  display: inline-block;
-}
+  padding-left: 24px;
-.openerp ul.oe_form_steps .oe_form_steps_active {
-  font-weight: bold;
-  color: #b33630;
-}
-.openerp ul.oe_form_steps_clickable {
-  height: 30px;
   margin: 0;
-  padding: 0;
+  position: relative;
-  text-shadow: 0 1px 1px #cacaca;
+  z-index: 10;
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0.5);
+}
+.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow {
+  width: 17px;
+  display: inline-block;
+  vertical-align: top;
   overflow: hidden;
+  margin-left: -5px;
+}
+.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span {
+  position: relative;
+  z-index: 11;
+  width: 24px;
+  height: 24px;
+  display: inline-block;
+  margin-left: -12px;
+  margin-top: 3px;
+  box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2);
+  background-color: #dedede;
+  background: -moz-linear-gradient(135deg, #dedede, #fcfcfc);
+  background: -o-linear-gradient(135deg, #fcfcfc, #dedede);
+  background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede));
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-transform: rotate(45deg);
+  -webkit-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+}
+.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active {
+  background-color: #729fcf;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
+  background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -moz-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -ms-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -o-linear-gradient(top, #729fcf, #3465a4);
+  background-image: linear-gradient(to bottom, #729fcf, #3465a4);
+}
+.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span {
+  background-color: #3465a4;
+  background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
+  background: -o-linear-gradient(135deg, #729fcf, #3465a4);
+  background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
+}
+.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label {
+  color: white;
+  text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
 }
 .openerp ul.oe_form_steps_clickable li {
-  border-right: none;
-  padding: 0 0 0 12px;
-  position: relative;
-  float: left;
-  vertical-align: top;
-  height: 30px;
-  color: white;
-}
-.openerp ul.oe_form_steps_clickable li:after {
-  content: " ";
-  width: 0;
-  height: 0;
-  border-top: 21px solid transparent;
-  border-bottom: 21px solid transparent;
-  border-left: 5px solid #807fb4;
-  position: absolute;
-  top: 50%;
-  margin-top: -21px;
-  left: 100%;
-  z-index: 2;
-}
-.openerp ul.oe_form_steps_clickable li:hover:after {
-  border-left: 5px solid #807fb4;
-}
-.openerp ul.oe_form_steps_clickable li:before {
-  content: " ";
-  width: 0;
-  height: 0;
-  border-top: 21px solid transparent;
-  border-bottom: 21px solid transparent;
-  border-left: 5px solid white;
-  position: absolute;
-  top: 50%;
-  margin-top: -21px;
-  margin-left: 2px;
-  left: 100%;
-  z-index: 2;
-}
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_active {
-  font-weight: bold;
-  text-shadow: 0 1px 1px #999999;
-  box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25);
-  background-color: #dc5f59;
-  background: -webkit-linear-gradient(top, #dc5f59, #b33630);
-  color: white;
-}
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive {
   cursor: pointer;
-  box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25);
-  background-color: #adadcf;
-  background: -webkit-linear-gradient(top, #adadcf, #7c7ba7);
 }
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive div {
+.openerp ul.oe_form_steps_clickable li:hover {
-  padding: 0 30px 0 0;
+  background-color: #e8e8e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive:hover {
+.openerp ul.oe_form_steps_clickable li:hover .label {
-  background: -webkit-linear-gradient(top, #7c7ba7, #adadcf);
+  text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
 }
-.openerp ul.oe_form_steps_clickable li div {
+.openerp ul.oe_form_steps_clickable li:hover .arrow span {
-  padding: 0 30px 0 0;
+  background-color: #e8e8e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:after {
+.openerp ul.oe_form_steps_clickable li .label {
-  content: " ";
+  color: #7c7bad;
-  display: block;
-  width: 0;
-  height: 0;
-  border-top: 21px solid transparent;
-  border-bottom: 21px solid transparent;
-  border-left: 5px solid #b33630;
-  position: absolute;
-  top: 50%;
-  margin-top: -21px;
-  left: 100%;
-  z-index: 2;
 }
-.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:before {
+.openerp ul.oe_form_steps_clickable li.oe_active:hover {
-  content: " ";
+  background-color: #4c85c2;
-  display: block;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
-  width: 0;
+  background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
-  height: 0;
+  background-image: -moz-linear-gradient(top, #4c85c2, #284d7d);
-  border-top: 21px solid transparent;
+  background-image: -ms-linear-gradient(top, #4c85c2, #284d7d);
-  border-bottom: 21px solid transparent;
+  background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
-  border-left: 5px solid white;
+  background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
-  position: absolute;
+}
-  top: 50%;
+.openerp ul.oe_form_steps_clickable li.oe_active:hover .label {
-  margin-top: -21px;
+  text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
-  margin-left: 2px;
+}
-  left: 100%;
+.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
-  z-index: 2;
+  background-color: #284d7d;
+  background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
+  background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
+  background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
 }
 .openerp .oe_form .oe_subtotal_footer {
   width: 1% !important;
@@ -2156,7 +2158,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 160px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -2175,7 +2177,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2188,7 +2190,7 @@
   font-weight: bold;
   font-size: 20px;
   margin: 8px 0px 8px 0px;
-  color: #53637e;
+  color: #7c7bad;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;

addons/web/static/src/css/base.sass

@@ -1,13 +1,14 @@
 @charset "utf-8"
 
 // Variables {{{
-$section-title-color: #8786b7
+$facets-border: #afafb6
+$section-title-color: #7C7BAD
 $tag-bg-light: #f0f0fa
-$tag-bg-dark: #8786b7
+$tag-bg-dark: #7C7BAD
 $tag-border: #afafb6
 $tag-border-selected: #a6a6fe
 $hover-background: #f0f0fa
-$link-color: #8a89ba
+$link-color: #7C7BAD
 $sheet-max-width: 860px
 // }}}
 // Mixins {{{
@@ -87,6 +88,18 @@ $sheet-max-width: 860px
     -ms-box-sizing: #{$type}-box
     box-sizing: #{$type}-box
 
+@mixin skew-gradient($startColor: #555, $endColor: #333)
+    background-color: $endColor
+    background: -moz-linear-gradient(135deg, $endColor, $startColor)
+    background: -o-linear-gradient(135deg, $startColor, $endColor)
+    background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor))
+
+@mixin transform($transform)
+    -moz-transform: $transform
+    -webkit-transform: $transform
+    -o-transform: $transform
+    -ms-transform: $transform
+
 // Transforms the (readable) text of an inline element into an mmlicons icon,
 // allows for actual readable text in-code (and in readers?) with iconic looks
 @mixin text-to-icon($icon-name, $color: #404040)
@@ -129,6 +142,10 @@ $sheet-max-width: 860px
         opacity: 1
 // }}}
 
+@media print
+    .oe_topbar, .oe_leftbar, .oe_loading
+        display: none !important
+
 .openerp.openerp_webclient_container
     height: 100%
     position: relative
@@ -141,13 +158,14 @@ $sheet-max-width: 860px
     color: #4c4c4c
     font-size: 13px
     background: white
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
     // }}}
     //Placeholder style{{{
     \:-moz-placeholder
-        color: $facets-border !important
+        color: $tag-border !important
         font-style: italic !important
     \::-webkit-input-placeholder
-        color: $facets-border !important
+        color: $tag-border !important
         font-style: italic !important
     //}}}
     // Tag reset {{{
@@ -160,7 +178,7 @@ $sheet-max-width: 860px
         font-weight: bold
         background-color: #f0f0f0
         th
-            border-right: 1px dotted $facets-border
+            border-right: 1px dotted $tag-border
             &:last-child
                 border-right: none
     th, td
@@ -195,7 +213,7 @@ $sheet-max-width: 860px
     a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         display: inline-block
         border: 1px solid #ababab
-        color: #404040
+        color: #4c4c4c
         margin: 0
         padding: 3px 12px
         font-size: 13px
@@ -457,6 +475,8 @@ $sheet-max-width: 860px
         color: #eee
 
     .oe_tags
+        &.oe_inline
+            min-width: 250px
         .text-wrap
             width: 100% !important
             textarea
@@ -554,7 +574,7 @@ $sheet-max-width: 860px
         top: 26px
         left: 0
         z-index: 1
-        border: 1px solid $facets-border
+        border: 1px solid $tag-border
         background: white
         padding: 4px 0
         min-width: 140px
@@ -794,11 +814,6 @@ $sheet-max-width: 860px
                 background: #303030
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-            .oe_active
-                background: #303030
-                font-weight: bold
-                color: white
-                @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
 
         .oe_topbar_avatar
             width: 24px
@@ -834,7 +849,7 @@ $sheet-max-width: 860px
         display: none
         width: 220px
         background: #f0eeee
-        border-right: 1px solid $facets-border
+        border-right: 1px solid $tag-border
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
     a.oe_logo
@@ -886,25 +901,25 @@ $sheet-max-width: 860px
         float: left
         padding: 0
         margin: 0
-        li
+        > li
             float: left
-        a
+            > a
-            display: block
+                display: block
-            padding: 5px 10px 7px
+                padding: 5px 10px 7px
-            line-height: 20px
+                line-height: 20px
-            height: 20px
+                height: 20px
-            color: #eee
+                color: #eee
-            vertical-align: top
+                vertical-align: top
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+                text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            &:hover
+                &:hover
+                    background: #303030
+                    color: white
+                    @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+            > .oe_active
                 background: #303030
+                font-weight: bold
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-        .oe_active
-            background: #303030
-            font-weight: bold
-            color: white
-            @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
@@ -1005,6 +1020,9 @@ $sheet-max-width: 860px
             .oe_header_row:last-child
                 td
                     padding-top: 0
+            .oe_header_row:first-child
+                td
+                    padding-top: 8px
             .oe_view_manager_sidebar
                 margin: 0px auto
                 text-align: center
@@ -1275,7 +1293,7 @@ $sheet-max-width: 860px
             background-color: white
             min-width: 100%
             display: none
-            border: 1px solid $facets-border
+            border: 1px solid $tag-border
             text-align: left
             @include radius(4px)
             @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
@@ -1482,11 +1500,10 @@ $sheet-max-width: 860px
         .oe_form .oe_form_field_date
             width: auto
     .oe_form_nosheet
-        margin: 8px
+        margin: 16px
-    .oe_form_nosheet > header
+        > header
-        margin-top: -20px
+            margin: -16px -16px 0 -16px
-        margin-left: -20px
+            padding: 8px
-        margin-right: -20px
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -1494,8 +1511,6 @@ $sheet-max-width: 860px
             position: relative
             border-bottom: 1px solid #cacaca
             @include vertical-gradient(#fcfcfc, #dedede)
-            padding: 0 8px
-            line-height: 30px
             ul
                 display: inline-block
                 float: right
@@ -1503,130 +1518,91 @@ $sheet-max-width: 860px
             min-width: 650px
             max-width: $sheet-max-width
             margin: 0 auto
+            padding: 16px 0 48px
         div.oe_form_configuration
             div.oe_horizontal_separator 
-                margin: 25px 0 10px 0
+                margin: 12px 0 8px 0
             p
                 color: #aaa
                 max-width: 650px
             label
                 min-width: 150px
-    ul.oe_form_steps
+            .oe_form_group_cell_label
-        height: 30px
+                padding: 2px 0
-        padding: 0
+            .oe_form_group_cell div div
-        margin: 0
+                padding: 1px 0
-        text-shadow: 0 1px 1px white
+                
-        img
+
-            vertical-align: top
+    ul.oe_form_steps, ul.oe_form_steps_clickable
-            margin-left: 8px
+        display: inline-block
-        li
+        padding-right: 18px
-            border-right: none
+        li 
-            padding: 0
+            display: inline-block
-            margin: 0
+            margin-right: -20px
-            float: left
+            @include vertical-gradient(#fcfcfc, #dedede)
-            vertical-align: top
+            &:first-child .label
-            height: 30px
-            padding: 0 0 0 12px
-            &:first-child
                 border-left: 1px solid #cacaca
+                padding-left: 14px
             &:last-child
-                margin-right: 12px
-                padding-right: 12px
                 border-right: 1px solid #cacaca
-            a
+                .label
+                    padding-right: 14px
+                .arrow
+                    display: none
+            .label 
                 color: #4c4c4c
-                &:hover
+                text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
-                    color: black
+                padding: 7px
-        .oe_form_steps_active
+                display: inline-block
-            font-weight: bold
+                padding-left: 24px
-            color: #b33630
+                margin: 0
-    ul.oe_form_steps_clickable
+                position: relative
-        height: 30px
+                z-index: 10
-        margin: 0
+            .arrow
-        padding: 0
+                width: 17px
-        text-shadow: 0 1px 1px #cacaca
+                display: inline-block
-        box-shadow: 0 0 1px rgba(0,0,0,0.5)
+                vertical-align: top
-        overflow: hidden
+                overflow: hidden
-        li
+                margin-left: -5px
-            border-right: none
+                span 
-            padding: 0 0 0 12px
+                    position: relative
-            position: relative
+                    z-index: 11
-            float: left
+                    width: 24px
-            vertical-align: top
+                    height: 24px
-            height: 30px
+                    display: inline-block
-            color: white
+                    margin-left: -12px
-            &:after
+                    margin-top: 3px
-                content: " "
+                    box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
-                width: 0
+                    @include skew-gradient(#fcfcfc, #dedede)
-                height: 0
+                    @include radius(3px)
-                border-top: 21px solid transparent
+                    @include transform(rotate(45deg))
-                border-bottom: 21px solid transparent
+        li.oe_active
-                border-left: 5px solid #807fb4
+            @include vertical-gradient(#729fcf, #3465a4)
-                position: absolute
+            .arrow span 
-                top: 50%
+                @include skew-gradient(#729fcf, #3465a4)
-                margin-top: -21px
+            .label
-                left: 100%
-                z-index: 2
-            &:hover:after
-                border-left: 5px solid #807fb4
-            &:before
-                content: " "
-                width: 0
-                height: 0
-                border-top: 21px solid transparent
-                border-bottom: 21px solid transparent
-                border-left: 5px solid white
-                position: absolute
-                top: 50%
-                margin-top: -21px
-                margin-left: 2px
-                left: 100%
-                z-index: 2
-            &.oe_form_steps_active
-                font-weight: bold
-                text-shadow: 0 1px 1px #999999
-                box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25)
-                background-color: #dc5f59
-                background: -webkit-linear-gradient(top, #dc5f59, #b33630)
                 color: white
-            &.oe_form_steps_inactive
+                text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
-                cursor: pointer
+
-                box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25)
+    ul.oe_form_steps_clickable
-                background-color: #adadcf
+        li
-                background: -webkit-linear-gradient(top, #adadcf, #7c7ba7)
+            cursor: pointer
-                div
+            &:hover 
-                    padding: 0 30px 0 0
+                @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-            &.oe_form_steps_inactive:hover
+                .label
-                background: -webkit-linear-gradient(top, #7c7ba7, #adadcf)
+                    text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
-            div
+                .arrow span 
-                padding: 0 30px 0 0            
+                    @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-            &.oe_form_steps_active:after
+            .label
-                content: " "
+                color: $link-color
-                display: block
+        li.oe_active
-                width: 0
+            &:hover 
-                height: 0
+                @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
-                border-top: 21px solid transparent
+                .label
-                border-bottom: 21px solid transparent
+                    text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
-                border-left: 5px solid #b33630
+                .arrow span 
-                position: absolute
+                    @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
-                top: 50%
+
-                margin-top: -21px
-                left: 100%
-                z-index: 2
-            &.oe_form_steps_active:before
-                content: " "
-                display: block
-                width: 0
-                height: 0
-                border-top: 21px solid transparent
-                border-bottom: 21px solid transparent
-                border-left: 5px solid white
-                position: absolute
-                top: 50%
-                margin-top: -21px
-                margin-left: 2px
-                left: 100%
-                z-index: 2
     .oe_form .oe_subtotal_footer
         width: 1% !important
         td.oe_form_group_cell
@@ -1660,7 +1636,7 @@ $sheet-max-width: 860px
             background: white
             min-height: 330px
             padding: 16px
-            border: 1px solid $facets-border
+            border: 1px solid $tag-border
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
             .ui-tabs
                 margin: 0 -16px
@@ -1677,7 +1653,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 160px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1707,7 +1683,7 @@ $sheet-max-width: 860px
         font-weight: bold
         font-size: 20px
         margin: 8px 0px 8px 0px
-        color: #53637e
+        color: $section-title-color
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator
@@ -2095,7 +2071,7 @@ $sheet-max-width: 860px
             border-bottom: 2px solid #cacaca
         .treeview-tr, .treeview-td
             cursor: pointer
-            border-right: 1px dotted $facets-border
+            border-right: 1px dotted $tag-border
             vertical-align: top
             text-align: left
             border-bottom: 1px solid #cfcccc

addons/web/static/src/js/chrome.js

@@ -193,7 +193,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
     on_traceback: function(error) {
         var self = this;
         var buttons = {};
-        if (instance.connection.openerp_entreprise) {
+        if (instance.session.openerp_entreprise) {
             buttons[_t("Send OpenERP Enterprise Report")] = function() {
                 var $this = $(this);
                 var issuename = $('#issuename').val();
@@ -224,7 +224,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
             min_height: '600px',
             buttons: buttons
         }).open();
-        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
+        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.session, error: error}));
     },
     on_javascript_exception: function(exception) {
         this.on_traceback({
@@ -269,7 +269,7 @@ instance.web.Loading = instance.web.Widget.extend({
 
         this.count += increment;
         if (this.count > 0) {
-            if (instance.connection.debug) {
+            if (instance.session.debug) {
                 this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count));
             } else {
                 this.$element.text(_t("Loading"));
@@ -316,7 +316,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
     },
     do_render: function() {
         var self = this;
-        $('.oe_topbar,.oe_leftbar').show();
+        instance.webclient.toggle_bars(true);
         self.$element.html(QWeb.render("DatabaseManager", { widget : self }));
         $('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self }));
         $('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self }));
@@ -501,7 +501,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
     },
     do_exit: function () {
         this.$element.remove();
-        $('.oe_topbar,.oe_leftbar').hide();
+        instance.webclient.toggle_bars(false);
         this.do_action('login');
     }
 });
@@ -510,11 +510,11 @@ instance.web.client_actions.add("database_manager", "instance.web.DatabaseManage
 instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
-    _db_list: null,
 
     init: function(parent, params) {
         this._super(parent);
         this.has_local_storage = typeof(localStorage) != 'undefined';
+        this.db_list = null;
         this.selected_db = null;
         this.selected_login = null;
         this.params = params || {};
@@ -537,50 +537,41 @@ instance.web.Login =  instance.web.Widget.extend({
         self.$element.find('.oe_login_manage_db').click(function() {
             self.do_action("database_manager");
         });
-        return self.load_db_list().then(self.on_db_list_loaded).then(function() {
+        var d;
-            if (self.params.db) {
+        if (self.params.db) {
-                self.do_login(self.params.db, self.params.login, self.params.password);
+            d = self.do_login(self.params.db, self.params.login, self.params.password);
-            }
+        } else {
-        });
+            d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed);
-    },
-    load_db_list: function (force) {
-        var d = $.when(), self = this;
-        if (_.isNull(this._db_list) || force) {
-            d = self.rpc("/web/database/get_list", {}, function(result) {
-                self._db_list = _.clone(result.db_list);
-            }, function(error, event) {
-                if (error.data.fault_code === 'AccessDenied') {
-                    event.preventDefault();
-                }
-            });
         }
         return d;
     },
-    on_db_list_loaded: function () {
+    on_db_loaded: function (result) {
-        var self = this;
+        this.db_list = result.db_list;
-        var list = this._db_list;
+        this.$("[name=db]").replaceWith(QWeb.render('Login.dblist', { db_list: this.db_list, selected_db: this.selected_db}));
-        var dbdiv = this.$element.find('div.oe_login_dbpane');
+        if(this.db_list.length === 0) {
-        this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
-        if(list.length === 0) {
             this.do_action("database_manager");
-        } else if(list && list.length === 1) {
+        } else if(this.db_list.length === 1) {
-            dbdiv.hide();
+            this.$('div.oe_login_dbpane').hide();
         } else {
-            dbdiv.show();
+            this.$('div.oe_login_dbpane').show();
+        }
+    },
+    on_db_failed: function (error, event) {
+        if (error.data.fault_code === 'AccessDenied') {
+            event.preventDefault();
         }
     },
     on_submit: function(ev) {
         if(ev) {
             ev.preventDefault();
         }
-        var $e = this.$element;
+        var db = this.$("form [name=db]").val();
-        var db = $e.find("form [name=db]").val();
         if (!db) {
             this.do_warn("Login", "No database selected !");
             return false;
         }
-        var login = $e.find("form input[name=login]").val();
+        var login = this.$("form input[name=login]").val();
-        var password = $e.find("form input[name=password]").val();
+        var password = this.$("form input[name=password]").val();
 
         this.do_login(db, login, password);
     },
@@ -611,16 +602,11 @@ instance.web.Login =  instance.web.Widget.extend({
             }
             self.trigger('login_successful');
         },function () {
-            self.$(".oe_login_pane").fadeIn("fast");
+            self.$(".oe_login_pane").fadeIn("fast", function() {
-            self.$element.addClass("oe_login_invalid");
+                self.$element.addClass("oe_login_invalid");
+            });
         });
     },
-    show: function () {
-        this.$element.show();
-    },
-    hide: function () {
-        this.$element.hide();
-    }
 });
 instance.web.client_actions.add("login", "instance.web.Login");
 
@@ -635,11 +621,11 @@ instance.web.Reload = instance.web.Widget.extend({
     },
     start: function() {
         var l = window.location;
-        var timestamp = new Date().getTime();
+
-        var search = "?ts=" + timestamp;
+        var sobj = $.deparam(l.search.substr(1));
-        if (l.search) {
+        sobj.ts = new Date().getTime();
-            search = l.search + "&ts=" + timestamp;
+        var search = '?' + $.param(sobj);
-        }
+
         var hash = l.hash;
         if (this.menu_id) {
             hash = "#menu_id=" + this.menu_id;
@@ -744,6 +730,7 @@ instance.web.Menu =  instance.web.Widget.extend({
             var $more = $(QWeb.render('Menu.more')),
                 $index = this.$element.find('li').eq(maximum_visible_links - 1);
             $index.after($more);
+            //$('.oe_topbar').append($more);
             $more.find('.oe_menu_more').append($index.next().nextAll());
         }
     },
@@ -881,8 +868,8 @@ instance.web.UserMenu =  instance.web.Widget.extend({
             var func = new instance.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
                 var topbar_name = res.name;
-                if(instance.connection.debug)
+                if(instance.session.debug)
-                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.connection.db);
+                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.session.db);
                 if(res.company_id[0] > 1)
                     topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]);
                 self.$element.find('.oe_topbar_name').text(topbar_name);
@@ -899,7 +886,7 @@ instance.web.UserMenu =  instance.web.Widget.extend({
     on_menu_settings: function() {
         var self = this;
         self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) {
-            result.result.res_id = instance.connection.uid;
+            result.result.res_id = instance.session.uid;
             self.getParent().action_manager.do_action(result.result);
         });
     },
@@ -926,7 +913,7 @@ instance.web.Client = instance.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        return instance.connection.session_bind(this.origin).pipe(function() {
+        return instance.session.session_bind(this.origin).pipe(function() {
             var $e = $(QWeb.render(self._template, {}));
             self.replaceElement($e);
             self.bind_events();
@@ -962,14 +949,14 @@ instance.web.Client = instance.web.Widget.extend({
         instance.web.bus.on('click', this, function(ev) {
             $.fn.tipsy.clear();
             if (!$(ev.target).is('input[type=file]')) {
-                self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
+                self.$element.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened');
             }
         });
     },
     show_common: function() {
         var self = this;
         this.crashmanager =  new instance.web.CrashManager();
-        instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+        instance.session.on_rpc_error.add(this.crashmanager.on_rpc_error);
         self.notification = new instance.web.Notification(this);
         self.notification.appendTo(self.$element);
         self.loading = new instance.web.Loading(self);
@@ -977,6 +964,9 @@ instance.web.Client = instance.web.Widget.extend({
         self.action_manager = new instance.web.ActionManager(self);
         self.action_manager.appendTo(self.$('.oe_application'));
     },
+    toggle_bars: function(value) {
+        this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value);
+    }
 });
 
 instance.web.WebClient = instance.web.Client.extend({
@@ -1018,13 +1008,27 @@ instance.web.WebClient = instance.web.Client.extend({
         };
     },
     show_login: function() {
-        this.$('.oe_topbar').hide();
+        this.toggle_bars(false);
-        this.action_manager.do_action("login");
+        
-        this.action_manager.inner_widget.on('login_successful', this, this.show_application);
+        var action = {
+            'type': 'ir.actions.client',
+            'tag': 'login'
+        };
+        var state = $.bbq.getState(true);
+        if (state.action === "login") {
+            action.params = state;
+        }
+
+        this.action_manager.do_action(action);
+        this.action_manager.inner_widget.on('login_successful', this, function() {
+            this.do_push_state(state);
+            this._current_state = null;     // ensure the state will be loaded
+            this.show_application();        // will load the state we just pushed
+        });
     },
     show_application: function() {
         var self = this;
-        self.$('.oe_topbar').show();
+        self.toggle_bars(true);
         self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on('menu_click', this, this.on_menu_action);
@@ -1049,7 +1053,7 @@ instance.web.WebClient = instance.web.Client.extend({
     do_reload: function() {
         var self = this;
         return this.session.session_reload().pipe(function () {
-            instance.connection.load_modules(true).pipe(
+            instance.session.load_modules(true).pipe(
                 self.menu.proxy('do_reload')); });
 
     },
@@ -1066,8 +1070,6 @@ instance.web.WebClient = instance.web.Client.extend({
         this.session.session_logout().then(function () {
             $(window).unbind('hashchange', self.on_hashchange);
             self.do_push_state({});
-            //would be cool to be able to do this, but I think it will make addons do strange things
-            //this.show_login();
             window.location.reload();
         });
     },
@@ -1156,7 +1158,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).pipe(function() {
-            return instance.connection.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
+            return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
                 return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
                     var action = result.result;
                     action.flags = _.extend({

addons/web/static/src/js/corelib.js

@@ -692,7 +692,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         instance.web.WidgetMixin.init.call(this,parent);
         // FIXME: this should not be
         this.setElement(this._make_descriptive());
-        this.session = instance.connection;
+        this.session = instance.session;
     },
     /**
      * Renders the element. The default implementation renders the widget using QWeb,
@@ -841,7 +841,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        instance.connection.rpc(url, data). then(function() {
+        instance.session.rpc(url, data). then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -863,7 +863,7 @@ instance.web.Registry = instance.web.Class.extend({
      *
      * An object path is simply a dotted name from the instance root to the
      * object pointed to (e.g. ``"instance.web.Session"`` for an OpenERP
-     * connection object).
+     * session object).
      *
      * @constructs instance.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths

addons/web/static/src/js/coresetup.js

@@ -11,32 +11,6 @@ if (!console.debug) {
 
 openerp.web.coresetup = function(instance) {
 
-/**
- * @deprecated use :class:`instance.web.Widget`
- */
-instance.web.OldWidget = instance.web.Widget.extend({
-    init: function(parent, element_id) {
-        this._super(parent);
-        this.element_id = element_id;
-        this.element_id = this.element_id || _.uniqueId('widget-');
-
-        var tmp = document.getElementById(this.element_id);
-        this.setElement(tmp || this._make_descriptive());
-    },
-    renderElement: function() {
-        var rendered = this.render();
-        if (rendered) {
-            this.replaceElement($(rendered));
-        }
-        return this;
-    },
-    render: function (additional) {
-        if (this.template)
-            return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
-        return null;
-    }
-});
-
 /** Session openerp specific RPC class */
 instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{
     init: function() {
@@ -540,7 +514,7 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-    if (instance.connection.synch)
+    if (instance.session.synch)
         return $.when.apply(this, arguments);
     else
         return old_async_when.apply(this, arguments);
@@ -549,43 +523,81 @@ $.async_when = function() {
 /** Setup blockui */
 if ($.blockUI) {
     $.blockUI.defaults.baseZ = 1100;
-    $.blockUI.defaults.message = '<div class="oe_blockui_spin" style="height: 50px">';
+    $.blockUI.defaults.message = '<div class="oe_blockui_spin_container">';
     $.blockUI.defaults.css.border = '0';
     $.blockUI.defaults.css["background-color"] = '';
-    $.blockUI.spinners = [];
 }
+
+var messages_by_seconds = [
+    [0, "Loading..."],
+    [30, "Still Loading..."],
+    [60, "Still Loading...<br />Please be patient."],
+    [120, "Hey, guess what?<br />It's still loading."],
+    [300, "You may not believe it,<br/>but the application is actually loading..."],
+];
+
+instance.web.Throbber = instance.web.Widget.extend({
+    template: "Throbber",
+    start: function() {
+        var opts = {
+          lines: 13, // The number of lines to draw
+          length: 7, // The length of each line
+          width: 4, // The line thickness
+          radius: 10, // The radius of the inner circle
+          rotate: 0, // The rotation offset
+          color: '#FFF', // #rgb or #rrggbb
+          speed: 1, // Rounds per second
+          trail: 60, // Afterglow percentage
+          shadow: false, // Whether to render a shadow
+          hwaccel: false, // Whether to use hardware acceleration
+          className: 'spinner', // The CSS class to assign to the spinner
+          zIndex: 2e9, // The z-index (defaults to 2000000000)
+          top: 'auto', // Top position relative to parent in px
+          left: 'auto' // Left position relative to parent in px
+        };
+        this.spin = new Spinner(opts).spin(this.$element[0]);
+        this.start_time = new Date().getTime();
+        this.act_message();
+    },
+    act_message: function() {
+        var self = this;
+        setTimeout(function() {
+            if (self.isDestroyed())
+                return;
+            var seconds = (new Date().getTime() - self.start_time) / 1000;
+            var mes;
+            _.each(messages_by_seconds, function(el) {
+                if (seconds >= el[0])
+                    mes = el[1];
+            });
+            self.$(".oe_throbber_message").html(mes);
+            self.act_message();
+        }, 1000);
+    },
+    destroy: function() {
+        if (this.spin)
+            this.spin.stop();
+        this._super();
+    },
+});
+instance.web.Throbber.throbbers = [];
+
 instance.web.blockUI = function() {
     var tmp = $.blockUI.apply($, arguments);
-    var target = $(".oe_blockui_spin")[0];
+    var throbber = new instance.web.Throbber();
-    var opts = {
+    instance.web.Throbber.throbbers.push(throbber);
-      lines: 13, // The number of lines to draw
+    throbber.appendTo($(".oe_blockui_spin_container"));
-      length: 7, // The length of each line
-      width: 4, // The line thickness
-      radius: 10, // The radius of the inner circle
-      rotate: 0, // The rotation offset
-      color: '#FFF', // #rgb or #rrggbb
-      speed: 1, // Rounds per second
-      trail: 60, // Afterglow percentage
-      shadow: false, // Whether to render a shadow
-      hwaccel: false, // Whether to use hardware acceleration
-      className: 'spinner', // The CSS class to assign to the spinner
-      zIndex: 2e9, // The z-index (defaults to 2000000000)
-      top: 'auto', // Top position relative to parent in px
-      left: 'auto' // Left position relative to parent in px
-    };
-    var spinner = new Spinner(opts).spin(target);
-    $.blockUI.spinners.push(spinner);
     return tmp;
 }
 instance.web.unblockUI = function() {
-    _.each($.blockUI.spinners, function(el) {
+    _.each(instance.web.Throbber.throbbers, function(el) {
-        el.stop();
+        el.destroy();
     });
     return $.unblockUI.apply($, arguments);
 }
 
 /** Setup default session */
-instance.connection = new instance.web.Session();
+instance.session = new instance.web.Session();
 
 /** Configure default qweb */
 instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
@@ -604,8 +616,8 @@ instance.web._lt = function (s) {
     return {toString: function () { return instance.web._t(s); }}
 };
 instance.web.qweb = new QWeb2.Engine();
-instance.web.qweb.default_dict['__debug__'] = instance.connection.debug; // Which one ?
+instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ?
-instance.web.qweb.debug = instance.connection.debug;
+instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
     '_t' : instance.web._t
@@ -662,7 +674,7 @@ var _t = instance.web._t;
     _t('%d years ago');
 }
 
-instance.connection.on('module_loaded', this, function () {
+instance.session.on('module_loaded', this, function () {
     // provide timeago.js with our own translator method
     $.timeago.settings.translator = instance.web._t;
 });

addons/web/static/src/js/data.js

@@ -58,7 +58,7 @@ instance.web.Query = instance.web.Class.extend({
     },
     _execute: function () {
         var self = this;
-        return instance.connection.rpc('/web/dataset/search_read', {
+        return instance.session.rpc('/web/dataset/search_read', {
             model: this._model.name,
             fields: this._fields || false,
             domain: this._model.domain(this._filter),
@@ -233,7 +233,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
             kwargs = args;
             args = [];
         }
-        return instance.connection.rpc('/web/dataset/call_kw', {
+        return instance.session.rpc('/web/dataset/call_kw', {
             model: this.name,
             method: method,
             args: args,
@@ -256,7 +256,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      * @param {String} signal signal to trigger on the workflow
      */
     exec_workflow: function (id, signal) {
-        return instance.connection.rpc('/web/dataset/exec_workflow', {
+        return instance.session.rpc('/web/dataset/exec_workflow', {
             model: this.name,
             id: id,
             signal: signal
@@ -282,7 +282,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      */
     context: function (context) {
         return new instance.web.CompoundContext(
-            instance.connection.user_context, this._context, context || {});
+            instance.session.user_context, this._context, context || {});
     },
     /**
      * Button action caller, needs to perform cleanup if an action is returned
@@ -292,7 +292,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      * FIXME: remove when evaluator integrated
      */
     call_button: function (method, args) {
-        return instance.connection.rpc('/web/dataset/call_button', {
+        return instance.session.rpc('/web/dataset/call_button', {
             model: this.name,
             method: method,
             domain_id: null,
@@ -439,7 +439,7 @@ instance.web.data = {
     })
 };
 
-instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
+instance.web.DataGroup =  instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
      * records.
@@ -451,9 +451,9 @@ instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends openerp.web.
      * content of the current grouping level.
      *
      * @constructs instance.web.DataGroup
-     * @extends instance.web.OldWidget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {instance.web.OldWidget} parent widget
+     * @param {instance.web.CallbackEnabled} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -524,13 +524,13 @@ instance.web.StaticDataGroup = instance.web.GrouplessDataGroup.extend( /** @lend
     }
 });
 
-instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{
+instance.web.DataSet =  instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataSet# */{
     /**
      * DateaManagement interface between views and the collection of selected
      * OpenERP records (represents the view's state?)
      *
      * @constructs instance.web.DataSet
-     * @extends instance.web.OldWidget
+     * @extends instance.web.CallbackEnabled
      *
      * @param {String} model the OpenERP model this dataset will manage
      */
@@ -706,7 +706,7 @@ instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends openerp.web.Da
      * @returns {$.Deferred}
      */
     call_and_eval: function (method, args, domain_index, context_index, callback, error_callback) {
-        return this.rpc('/web/dataset/call', {
+        return instance.session.rpc('/web/dataset/call', {
             model: this.model,
             method: method,
             domain_id: domain_index == undefined ? null : domain_index,
@@ -805,6 +805,22 @@ instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends openerp.web.Da
     alter_ids: function(n_ids) {
         this.ids = n_ids;
     },
+    /**
+     * Resequence records.
+     *
+     * @param {Array} ids identifiers of the records to resequence
+     * @returns {$.Deferred}
+     */
+    resequence: function (ids, options) {
+        options = options || {};
+        return instance.session.rpc('/web/dataset/resequence', {
+            model: this.model,
+            ids: ids,
+            context: this._model.context(options.context),
+        }).pipe(function (results) {
+            return results;
+        });
+    },
 });
 instance.web.DataSetStatic =  instance.web.DataSet.extend({
     init: function(parent, model, context, ids) {

addons/web/static/src/js/search.js

@@ -1613,7 +1613,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             }
             var filter = {
                 name: $name.val(),
-                user_id: private_filter ? instance.connection.uid : false,
+                user_id: private_filter ? instance.session.uid : false,
                 model_id: self.view.model,
                 context: results.context,
                 domain: results.domain
@@ -1737,11 +1737,11 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
     }
 });
 
-instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
+instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
     template: 'SearchView.extended_search.proposition',
     /**
      * @constructs instance.web.search.ExtendedSearchProposition
-     * @extends instance.web.OldWidget
+     * @extends instance.web.Widget
      *
      * @param parent
      * @param fields

addons/web/static/src/js/test_support.js

@@ -1,12 +1,12 @@
 openerp.test_support = {
-    setup_connection: function (connection) {
+    setup_session: function (session) {
         var origin = location.protocol+"//"+location.host;
-        _.extend(connection, {
+        _.extend(session, {
             origin: origin,
             prefix: origin,
             server: origin, // keep chs happy
             //openerp.web.qweb.default_dict['_s'] = this.origin;
-            rpc_function: connection.rpc_json,
+            rpc_function: session.rpc_json,
             session_id: false,
             uid: false,
             username: false,
@@ -22,7 +22,7 @@ openerp.test_support = {
             shortcuts: [],
             active_id: null
         });
-        return connection.session_reload();
+        return session.session_reload();
     },
     module: function (title, tested_core, nonliterals) {
         var conf = QUnit.config.openerp = {};
@@ -31,10 +31,10 @@ openerp.test_support = {
                 QUnit.stop();
                 var oe = conf.openerp = window.openerp.init();
                 window.openerp.web[tested_core](oe);
-                var done = openerp.test_support.setup_connection(oe.connection);
+                var done = openerp.test_support.setup_session(oe.session);
                 if (nonliterals) {
                     done = done.pipe(function () {
-                        return oe.connection.rpc('/tests/add_nonliterals', {
+                        return oe.session.rpc('/tests/add_nonliterals', {
                             domains: nonliterals.domains || [],
                             contexts: nonliterals.contexts || []
                         }).then(function (r) {

addons/web/static/src/js/view_form.js

@@ -255,7 +255,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     /**
      *
      * @param {Object} [options]
-     * @param {Boolean} [editable=false] whether the form should be switched to edition mode. A value of ``false`` will keep the current mode.
+     * @param {Boolean} [mode=undefined] If specified, switch the form to specified mode. Can be "edit" or "view".
      * @param {Boolean} [reload=true] whether the form should reload its content on show, or use the currently loaded record
      * @return {$.Deferred}
      */
@@ -292,9 +292,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             });
         }
         return shown.pipe(function() {
-            if (options.editable) {
+            self._actualize_mode(options.mode || self.options.initial_mode);
-                self.to_edit_mode();
-            }
             self.$element.css({
                 opacity: '1',
                 filter: 'alpha(opacity = 100)'
@@ -634,12 +632,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this._actualize_mode("edit");
     },
     /**
-     * Reactualize actual_mode.
+     * Ask the view to switch to a precise mode if possible. The view is free to
+     * not respect this command if the state of the dataset is not compatible with
+     * the new mode. For example, it is not possible to switch to edit mode if
+     * the current record is not yet saved in database.
+     *
+     * @param {string} [new_mode] Can be "edit", "view", "create" or undefined. If
+     * undefined the view will test the actual mode to check if it is still consistent
+     * with the dataset state.
      */
     _actualize_mode: function(switch_to) {
         var mode = switch_to || this.get("actual_mode");
         if (! this.datarecord.id) {
             mode = "create";
+        } else if (mode === "create") {
+            mode = "edit";
         }
         this.set({actual_mode: mode});
     },
@@ -1656,7 +1663,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                         template = 'WidgetLabel.tooltip';
                     }
                     return QWeb.render(template, {
-                        debug: instance.connection.debug,
+                        debug: instance.session.debug,
                         widget: widget
                 })},
                 gravity: $.fn.tipsy.autoBounds(50, 'nw'),
@@ -1733,7 +1740,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.click(this.on_click);
-        if (this.node.attrs.help || instance.connection.debug) {
+        if (this.node.attrs.help || instance.session.debug) {
             this.do_attach_tooltip();
         }
         this.setupFocus(this.$element);
@@ -1901,6 +1908,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.field = this.field_manager.get_field(this.name);
         this.widget = this.node.attrs.widget;
         this.string = this.node.attrs.string || this.field.string || this.name;
+        this.options = JSON.parse(this.node.attrs.options || '{}');
         this.set({'value': false});
         this.set({required: this.modifiers['required'] === true});
 
@@ -1930,7 +1938,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
             }, this));
         }
         this.$label = this.view.$element.find('label[for=' + this.id_for_label + ']');
-        if (instance.connection.debug) {
+        if (instance.session.debug) {
             this.do_attach_tooltip(this, this.$label[0] || this.$element);
             this.$label.off('dblclick').on('dblclick', function() {
                 console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view);
@@ -1986,16 +1994,6 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
     focus: function() {
         return false;
     },
-    /**
-     * Utility method to get the widget options defined in the field xml description.
-     */
-    get_definition_options: function() {
-        if (!this.definition_options) {
-            var str = this.node.attrs.options || '{}';
-            this.definition_options = JSON.parse(str);
-        }
-        return this.definition_options;
-    },
     set_input_id: function(id) {
         this.id_for_label = id;
     },
@@ -2173,7 +2171,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     }
 });
 
-instance.web.DateTimeWidget = instance.web.OldWidget.extend({
+instance.web.DateTimeWidget = instance.web.Widget.extend({
     template: "web.datepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
@@ -2394,44 +2392,54 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  * To find more information about CLEditor configutation: go to
  * http://premiumsoftware.net/cleditor/docs/GettingStarted.html
  */
-instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
+instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
-
+    template: 'FieldTextHtml',
-    initialize_content: function() {
+    init: function() {
-        this.$textarea = this.$element.find('textarea');
-        var width = ((this.node.attrs || {}).editor_width || 468);
-        var height = ((this.node.attrs || {}).editor_height || 100);
-        this.$textarea.cleditor({
-            width:      width, // width not including margins, borders or padding
-            height:     height, // height not including margins, borders or padding
-            controls:   // controls to add to the toolbar
-                        "bold italic underline strikethrough | size " +
-                        "| removeformat | bullets numbering | outdent " +
-                        "indent | link unlink",
-            sizes:      // sizes in the font size popup
-                        "1,2,3,4,5,6,7",
-            bodyStyle:  // style to assign to document body contained within the editor
-                        "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
-        });
-        this.$cleditor = this.$textarea.cleditor()[0];
-        // call super now, because cleditor resets the disable attr
         this._super.apply(this, arguments);
-        // propagate disabled property to cleditor
+        if (this.field.type !== 'html') {
-        this.$cleditor.disable(this.$textarea.prop('disabled'));
+            throw new Error(_.str.sprintf(
+                _t("Error with field %s, it is not allowed to use the widget 'html' with any other field type than 'html'"), this.string));
+        }
+    },
+    initialize_content: function() {
+        var self = this;
+        if (! this.get("effective_readonly")) {
+            self._updating_editor = false;
+            this.$textarea = this.$element.find('textarea');
+            var width = ((this.node.attrs || {}).editor_width || 468);
+            var height = ((this.node.attrs || {}).editor_height || 100);
+            this.$textarea.cleditor({
+                width:      width, // width not including margins, borders or padding
+                height:     height, // height not including margins, borders or padding
+                controls:   // controls to add to the toolbar
+                            "bold italic underline strikethrough " +
+                            "| removeformat | bullets numbering | outdent " +
+                            "indent | link unlink | source",
+                bodyStyle:  // style to assign to document body contained within the editor
+                            "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
+            });
+            this.$cleditor = this.$textarea.cleditor()[0];
+            this.$cleditor.change(function() {
+                if (! self._updating_editor) {
+                    self.$cleditor.updateTextArea();
+                    self.set({'value': self.$textarea.val()});
+                }
+            });
+        }
     },
-
     set_value: function(value_) {
         this._super.apply(this, arguments);
-        this._dirty_flag = true;
+        this.render_value();
     },
-
     render_value: function() {
-        this._super.apply(this, arguments);
+        if (! this.get("effective_readonly")) {
-        this.$cleditor.updateFrame();
+            this.$textarea.val(this.get('value'));
-    },
+            this._updating_editor = true;
-
+            this.$cleditor.updateFrame();
-    get_value: function() {
+            this._updating_editor = false;
-        this.$cleditor.updateTextArea();
+        } else {
-        return this.$textarea.val();
+            this.$element.html(this.get('value'));
+        }
     },
 });
 
@@ -2650,7 +2658,7 @@ instance.web.form.CompletionFieldMixin = {
         var slow_create = function () {
             self._search_create_popup("form", undefined, {"default_name": name});
         };
-        if (self.get_definition_options().quick_create === undefined || self.get_definition_options().quick_create) {
+        if (self.options.quick_create === undefined || self.options.quick_create) {
             new instance.web.DataSet(this, this.field.relation, self.build_context())
                 .name_create(name, function(data) {
                     self.add_id(data[0]);
@@ -2706,6 +2714,11 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             this.floating = false;
             this.render_value();
         });
+        instance.web.bus.on('click', this, function() {
+            if (!this.get("effective_readonly") && this.$input && this.$input.autocomplete('widget').is(':visible')) {
+                this.$input.autocomplete("close");
+            }
+        });
     },
     initialize_content: function() {
         if (!this.get("effective_readonly"))
@@ -2902,7 +2915,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             var lines = _.escape(str).split("\n");
             var link = "";
             var follow = "";
-            if (! this.get_definition_options().highlight_first_line) {
+            if (! this.options.highlight_first_line) {
                 link = lines.join("<br />");
             } else {
                 link = lines[0];
@@ -2913,7 +2926,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             var $link = this.$element.find('.oe_form_uri')
                  .unbind('click')
                  .html(link);
-            if (! this.get_definition_options().no_open)
+            if (! this.options.no_open)
                 $link.click(function () {
                     self.do_action({
                         type: 'ir.actions.act_window',
@@ -2932,7 +2945,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         var self = this;
         if (value_ instanceof Array) {
             this.display_value = {};
-            if (! this.get_definition_options().always_reload) {
+            if (! this.options.always_reload) {
                 this.display_value["" + value_[0]] = value_[1];
             }
             value_ = value_[0];
@@ -2957,10 +2970,12 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
     },
     _quick_create: function() {
         this.no_tipsy = true;
+        this.tip_def.reject();
         return instance.web.form.CompletionFieldMixin._quick_create.apply(this, arguments);
     },
     _search_create_popup: function() {
         this.no_tipsy = true;
+        this.tip_def.reject();
         return instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments);
     },
 });
@@ -4087,7 +4102,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
 /**
  * Class with everything which is common between FormOpenPopup and SelectCreatePopup.
  */
-instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
+instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
     template: "AbstractFormPopup.render",
     /**
      *  options:
@@ -4651,18 +4666,23 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
 
 instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     template: "FieldStatus",
-    clickable: false,
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
+        this.options.clickable = this.options.clickable || (this.node.attrs || {}).clickable || false;
+        this.options.visible = this.options.visible || (this.node.attrs || {}).statusbar_visible || false;
+        this.selected_value = null;
+    },
     start: function() {
         this._super();
-        this.selected_value = null;
+        // backward compatibility
-        this.clickable = !!this.node.attrs.clickable;
+        this.loaded = new $.Deferred();
+        if (this.options.clickable) {
+            this.$element.on('click','li',this.on_click_stage);
+        }
+        // TODO move the following into css :after
         if (this.$element.parent().is('header')) {
             this.$element.after('<div class="oe_clear"/>');
         }
-        // preview in start only for selection fields, because of the dynamic behavior of many2one fields.
-        if (this.field.type in ['selection']) {
-            this.render_list();
-        }
     },
     set_value: function(value_) {
         var self = this;
@@ -4677,115 +4697,72 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         }
         // trick to be sure all values are loaded in the form, therefore
         // enabling the evaluation of dynamic domains
+        self.selection = [];
         $.async_when().then(function() {
-            return self.render_list();
+            self.get_selection();
         });
+        return this.loaded;
     },
-
+    /** Get the selection and render it
-    /** Get the status list and render them
+     *  selection: [[identifier, value_to_display], ...]
-     *  to_show: [[identifier, value_to_display]] where
-     *   - identifier = key for a selection, id for a many2one
-     *   - display_val = label that will be displayed
-     *   - ex: [[0, "New"]] (many2one) or [["new", "In Progress"]] (selection)
-     */
-    render_list: function() {
-        var self = this;
-        // get selection values, filter them and render them
-        var selection_done = this.get_selection().pipe(self.proxy('filter_selection')).pipe(self.proxy('render_elements'));
-    },
-
-    /** Get the selection list to be displayed in the statusbar widget.
      *  For selection fields: this is directly given by this.field.selection
-     *  For many2one fields :
+     *  For many2one fields:  perform a search on the relation of the many2one field
-     *  - perform a search on the relation of the many2one field (given by
-     *    field.relation )
-     *  - get the field domain for the search
-     *    - self.build_domain() gives the domain given by the view or by
-     *      the field
-     *    - if the optional statusbar_fold attribute is set to true, make
-     *      an AND with build_domain to hide all 'fold=true' columns
-     *    - make an OR with current value, to be sure it is displayed,
-     *      with the correct order, even if it is folded
      */
     get_selection: function() {
         var self = this;
         if (this.field.type == "many2one") {
-            this.selection = [];
+            var domain = new instance.web.CompoundDomain(['|'], self.build_domain(), [['id', '=', self.selected_value]]);
-            // get fold information from widget
+            var ds = new instance.web.DataSetSearch(this, this.field.relation, self.build_context(), domain);
-            var fold = ((this.node.attrs || {}).statusbar_fold || true);
+            ds.read_slice(['name'], {}).done( function (records) {
-            // build final domain: if fold option required, add the
+                for(var i = 0; i < records.length; i++) {
-            if (fold == true) {
+                    self.selection.push([records[i].id, records[i].name]);
-                var domain = new instance.web.CompoundDomain(['|'], ['&'], self.build_domain(), [['fold', '=', false]], [['id', '=', self.selected_value]]);
+                }
-            } else {
+                self.render_elements();
-                var domain = new instance.web.CompoundDomain(['|'], self.build_domain(), [['id', '=', self.selected_value]]);
+                self.loaded.resolve();
+            });
+        } else {
+            this.loaded.resolve();
+            // For field type selection filter values according to
+            // statusbar_visible attribute of the field. For example:
+            // statusbar_visible="draft,open".
+            var selection = this.field.selection;
+            console.log(selection);
+            for(var i=0; i< selection.length; i++) {
+                var key = selection[i][0];
+                if(key == this.selected_value || !this.options.visible || this.options.visible.indexOf(key) != -1) {
+                    this.selection.push(selection[i]);
+                }
             }
-            // get a DataSetSearch on the current field relation (ex: crm.lead.stage_id -> crm.case.stage)
+            console.log(this.selection);
-            var model_ext = new instance.web.DataSetSearch(this, this.field.relation, self.build_context(), domain);
+            this.render_elements();
-            // fetch selection
-            var read_defer = model_ext.read_slice(['name'], {}).pipe( function (records) {
-                _(records).each(function (record) {
-                    self.selection.push([record.id, record.name]);
-                });
-            });
-        } else {
-            this.selection = this.field.selection;
-            var read_defer = new $.Deferred().resolve();
-        }
-        return read_defer;
-    },
-
-    /** Filters this.selection, according to values coming from the statusbar_visible
-     *  attribute of the field. For example: statusbar_visible="draft,open"
-     *  Currently, the key of (key, label) pairs has to be used in the
-     *  selection of visible items. This feature is not meant to be used
-     *  with many2one fields.
-     */
-    filter_selection: function() {
-        var self = this;
-        var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
-            function(x) { return _.str.trim(x); });
-        shown = _.select(shown, function(x) { return x.length > 0; });
-
-        if (shown.length == 0) {
-            this.to_show = this.selection;
-        } else {
-            this.to_show = _.select(this.selection, function(x) {
-                return _.indexOf(shown, x[0]) !== -1 || x[0] === self.selected_value;
-            });
         }
     },
-
     /** Renders the widget. This function also checks for statusbar_colors='{"pending": "blue"}'
      *  attribute in the widget. This allows to set a given color to a given
      *  state (given by the key of (key, label)).
      */
     render_elements: function () {
         var self = this;
-        var content = instance.web.qweb.render("FieldStatus.content", {widget: this, _:_});
+        var content = instance.web.qweb.render("FieldStatus.content", {widget: this});
         this.$element.html(content);
-        if (this.clickable) {
-            this.$element.addClass("oe_form_steps_clickable");
-            $('.oe_form_steps_arrow').remove();
-            var elemts = this.$element.find('.oe_form_steps_button');
-            _.each(elemts, function(element){
-                $item = $(element);
-                if ($item.attr("data-id") != self.selected_value) {
-                    $item.click(function(event){
-                        var data_id = parseInt($(this).attr("data-id"))
-                        self.view.dataset.call('stage_set', [[self.view.datarecord.id],data_id]).then(function() {
-                            return self.view.reload();
-                        });
-                    });
-                }
-            });
-        } else {
-            this.$element.addClass("oe_form_steps");
-        }
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
         var color = colors[this.selected_value];
-        if (color) {            
+        if (color) {
-            var elem = this.$element.find("li.oe_form_steps_active span");
+            this.$("oe_active").css("color", color);
-            elem.css("color", color);            
+        }
+    },
+    on_click_stage: function (ev) {
+        var self = this;
+        var $li = $(ev.currentTarget);
+        var val = parseInt($li.data("id"));
+        if (val != self.selected_value) {
+            this.view.recursive_save().then(function() {
+                var change = {};
+                change[self.name] = val;
+                self.view.dataset.write(self.view.datarecord.id, change).then(function() {
+                    self.view.reload();
+                });
+            });
         }
     },
 });
@@ -4802,7 +4779,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'email' : 'instance.web.form.FieldEmail',
     'url' : 'instance.web.form.FieldUrl',
     'text' : 'instance.web.form.FieldText',
-    'text_html' : 'instance.web.form.FieldTextHtml',
+    'html' : 'instance.web.form.FieldTextHtml',
     'date' : 'instance.web.form.FieldDate',
     'datetime' : 'instance.web.form.FieldDatetime',
     'selection' : 'instance.web.form.FieldSelection',

addons/web/static/src/js/view_list.js

@@ -2059,7 +2059,7 @@ instance.web.list.Button = instance.web.list.Column.extend({
                 title: this.string || '',
                 additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
                     'disabled="disabled" class="oe_list_button_disabled"' : '',
-                prefix: instance.connection.prefix,
+                prefix: instance.session.prefix,
                 icon: this.icon,
                 alt: this.string || ''
             });
@@ -2086,7 +2086,7 @@ instance.web.list.Binary = instance.web.list.Column.extend({
         var text = _t("Download");
         var download_url = _.str.sprintf(
                 '/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
-                instance.connection.session_id, options.model, this.id, options.id);
+                instance.session.session_id, options.model, this.id, options.id);
         if (this.filename) {
             download_url += '&filename_field=' + this.filename;
             if (row_data[this.filename]) {

addons/web/static/src/js/views.js

@@ -159,7 +159,9 @@ instance.web.ActionManager = instance.web.Widget.extend({
                     //state = _.extend(this.inner_action.params || {}, state);
                 }
             }
-            this.getParent().do_push_state(state);
+            if(!this.dialog) {
+                this.getParent().do_push_state(state);
+            }
         }
     },
     do_load_state: function(state, warm) {
@@ -1331,12 +1333,10 @@ instance.web.View = instance.web.Widget.extend({
     do_search: function(view) {
     },
     on_sidebar_import: function() {
-        var import_view = new instance.web.DataImport(this, this.dataset);
+        new instance.web.DataImport(this, this.dataset).open();
-        import_view.start();
     },
     on_sidebar_export: function() {
-        var export_view = new instance.web.DataExport(this, this.dataset);
+        new instance.web.DataExport(this, this.dataset).open();
-        export_view.start();
     },
     on_sidebar_translate: function() {
         return this.do_action({

addons/web/static/src/xml/base.xml

@@ -975,6 +975,14 @@
         />
     </div>
 </t>
+<t t-name="FieldTextHtml">
+    <div t-att-class="'oe_form_field oe_form_field_html' + (widget.get('effective_readonly') ? ' oe_form_embedded_html' : '')"
+            t-att-style="widget.node.attrs.style">
+        <t t-if="! widget.get('effective_readonly')">
+            <textarea/>
+        </t>
+    </div>
+</t>
 <t t-name="web.datepicker">
     <span>
         <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
@@ -1009,12 +1017,12 @@
 <t t-name="FieldMany2One">
     <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <t t-if="widget.get('effective_readonly')">
-            <a t-if="! widget.get_definition_options().no_open" href="#" class="oe_form_uri"/>
+            <a t-if="! widget.options.no_open" href="#" class="oe_form_uri"/>
-            <span t-if="widget.get_definition_options().no_open" href="#" class="oe_form_uri"/>
+            <span t-if="widget.options.no_open" href="#" class="oe_form_uri"/>
             <span class="oe_form_m2o_follow"/>
         </t>
         <t t-if="!widget.get('effective_readonly')">
-            <a t-if="! widget.get_definition_options().no_open" href="#" tabindex="-1"
+            <a t-if="! widget.options.no_open" href="#" tabindex="-1"
                 class="oe_m2o_cm_button oe_e">/</a>
             <div>
                 <input type="text"
@@ -1075,19 +1083,14 @@
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul class="" t-att-style="widget.node.attrs.style"/>
+    <ul t-att-class="widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps'" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
-    <t t-set="size" t-value="widget.to_show.length"/>
+    <t t-foreach="widget.selection" t-as="i">
-    <t t-foreach="_.range(size)" t-as="i">
+        <li t-att-class="i[0] === widget.selected_value ? 'oe_active' : ''" t-att-data-id="i[0]">
-        <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : 'oe_form_steps_inactive'">
+            <span class="label"><t t-esc="i[1]"/></span>
-            <div class="oe_form_steps_button" t-att-data-id="widget.to_show[i][0]">
+            <!-- are you mit ? -->
-                <t t-esc="widget.to_show[i][1]"/>
+            <span class="arrow"><span></span></span>
-                <span class="oe_form_steps_arrow">
-                    <span></span>
-                </span>
-                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-            </div>
         </li>
     </t>
 </t>
@@ -1728,5 +1731,12 @@
 <div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to search')"/>
 </div>
-
+<t t-name="Throbber">
+    <div>
+        <div class="oe_blockui_spin" style="height: 50px">
+        </div>
+        <br />
+        <div class="oe_throbber_message" style="color:white"></div>
+    </div>
+</t>
 </templates>

addons/web/static/test/evals.js

@@ -12,7 +12,7 @@ $(document).ready(function () {
         // Context n should have base evaluation context + all of contexts
         // 0..n-1 in its own evaluation context
         var active_id = 4;
-        var result = openerp.connection.test_eval_contexts([
+        var result = openerp.session.test_eval_contexts([
             {
                 "__contexts": [
                     {
@@ -56,7 +56,7 @@ $(document).ready(function () {
         });
     });
     test('non-literal_eval_contexts', function () {
-        var result = openerp.connection.test_eval_contexts([{
+        var result = openerp.session.test_eval_contexts([{
             "__ref": "compound_context",
             "__contexts": [
                 {"__ref": "context", "__debug": "{'type':parent.type}",
@@ -141,9 +141,9 @@ $(document).ready(function () {
     });
     test('current_date', function () {
         var current_date = openerp.web.date_to_str(new Date());
-        var result = openerp.connection.test_eval_domains(
+        var result = openerp.session.test_eval_domains(
             [[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}],
-            openerp.connection.test_eval_get_context());
+            openerp.session.test_eval_get_context());
         deepEqual(result, [
             ['name', '>=', current_date],
             ['name', '<=', current_date]

addons/web/static/test/fulltest/dataset.js

@@ -7,7 +7,7 @@ $(document).ready(function () {
     t.module('Dataset shortcuts', 'data');
     t.test('read_index', function (openerp) {
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'some.model');
+            {session: openerp.session}, 'some.model');
         ds.ids = [10, 20, 30, 40, 50];
         ds.index = 2;
         t.expect(ds.read_index(['a', 'b', 'c']), function (result) {
@@ -24,7 +24,7 @@ $(document).ready(function () {
     });
     t.test('default_get', function (openerp) {
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'some.model', {foo: 'bar'});
+            {session: openerp.session}, 'some.model', {foo: 'bar'});
         t.expect(ds.default_get(['a', 'b', 'c']), function (result) {
             strictEqual(result.method, 'default_get');
             strictEqual(result.model, 'some.model');
@@ -38,7 +38,7 @@ $(document).ready(function () {
         });
     });
     t.test('create', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'some.model');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'some.model');
         t.expect(ds.create({foo: 1, bar: 2}), function (r) {
             strictEqual(r.method, 'create');
 
@@ -51,7 +51,7 @@ $(document).ready(function () {
         });
     });
     t.test('write', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.write(42, {foo: 1}), function (r) {
             strictEqual(r.method, 'write');
 
@@ -69,7 +69,7 @@ $(document).ready(function () {
 //        });
     });
     t.test('unlink', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.unlink([42]), function (r) {
             strictEqual(r.method, 'unlink');
 
@@ -81,7 +81,7 @@ $(document).ready(function () {
         });
     });
     t.test('call', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.call('frob', ['a', 'b', 42]), function (r) {
             strictEqual(r.method, 'frob');
 
@@ -92,7 +92,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_get', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_get([1, 2], null), function (r) {
             strictEqual(r.method, 'name_get');
 
@@ -104,7 +104,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_search, name', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_search('bob'), function (r) {
             strictEqual(r.method, 'name_search');
 
@@ -119,7 +119,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_search, domain & operator', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_search(0, [['foo', '=', 3]], 'someop'), function (r) {
             strictEqual(r.method, 'name_search');
 
@@ -134,7 +134,7 @@ $(document).ready(function () {
         });
     });
     t.test('exec_workflow', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.exec_workflow(42, 'foo'), function (r) {
             strictEqual(r['service'], 'object');
             strictEqual(r.method, 'exec_workflow');
@@ -147,7 +147,7 @@ $(document).ready(function () {
     });
 
     t.test('DataSetSearch#read_slice', function (openerp) {
-        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod');
         t.expect(ds.read_slice(['foo', 'bar'], {
             domain: [['foo', '>', 42], ['qux', '=', 'grault']],
             context: {peewee: 'herman'},
@@ -167,7 +167,7 @@ $(document).ready(function () {
         });
     });
     t.test('DataSetSearch#read_slice sorted', function (openerp) {
-        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod');
         ds.sort('foo');
         ds.sort('foo');
         ds.sort('bar');
@@ -194,7 +194,7 @@ $(document).ready(function () {
     });
     t.test('Dataset', function (openerp) {
         var ds = new openerp.web.DataSetSearch(
-            {session: openerp.connection}, 'mod');
+            {session: openerp.session}, 'mod');
         var c = new openerp.web.CompoundContext(
             {a: 'foo', b: 3, c: 5}, openerp.contexts[0]);
         t.expect(ds.read_slice(['foo', 'bar'], {
@@ -220,7 +220,7 @@ $(document).ready(function () {
             parent: {model: 'qux'}
         };
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'mod',
+            {session: openerp.session}, 'mod',
              new openerp.web.CompoundContext({})
                  .set_eval_context(eval_context));
         var domain = new openerp.web.CompoundDomain(openerp.domains[0])

addons/web/static/test/list-editable.js

@@ -87,10 +87,10 @@ $(document).ready(function () {
             });
     });
     asyncTest('toggle-edition-save', 4, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
-        instance.connection.responses['/web/dataset/call_kw:read'] = function () {
+        instance.session.responses['/web/dataset/call_kw:read'] = function () {
             return { result: [{
                 id: 42,
                 a: false,
@@ -125,7 +125,7 @@ $(document).ready(function () {
             })
     });
     asyncTest('toggle-edition-cancel', 2, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
         var e = new instance.web.list.Editor({
@@ -153,7 +153,7 @@ $(document).ready(function () {
             })
     });
     asyncTest('toggle-save-required', 2, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
         var e = new instance.web.list.Editor({
@@ -191,7 +191,7 @@ $(document).ready(function () {
             baseSetup();
 
             var records = {};
-            _.extend(instance.connection.responses, {
+            _.extend(instance.session.responses, {
                 '/web/listview/load': function () {
                     return {result: {
                         type: 'tree',
@@ -227,7 +227,7 @@ $(document).ready(function () {
     });
     asyncTest('newrecord', 6, function () {
         var got_defaults = false;
-        instance.connection.responses['/web/dataset/call_kw:default_get'] = function (params) {
+        instance.session.responses['/web/dataset/call_kw:default_get'] = function (params) {
             var fields = params.params.args[0];
             deepEqual(
                 fields, ['a', 'b', 'c'],
@@ -267,7 +267,7 @@ $(document).ready(function () {
     module('list-edition-events', {
         setup: function () {
             baseSetup();
-            _.extend(instance.connection.responses, {
+            _.extend(instance.session.responses, {
                 '/web/listview/load': function () {
                     return {result: {
                         type: 'tree',

addons/web/static/test/search.js

@@ -164,8 +164,8 @@ $(document).ready(function () {
         instance.dummy = {};
         instance.dummy.DummyWidget = instance.web.search.Field.extend(
             dummy_widget_attributes || {});
-        if (!('/web/searchview/load' in instance.connection.responses)) {
+        if (!('/web/searchview/load' in instance.session.responses)) {
-            instance.connection.responses['/web/searchview/load'] = function () {
+            instance.session.responses['/web/searchview/load'] = function () {
                 return {result: {fields_view: {
                     type: 'search',
                     fields: {
@@ -186,10 +186,10 @@ $(document).ready(function () {
                 }}};
             };
         }
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: []};
         };
-        instance.connection.responses['/web/searchview/fields_get'] = function () {
+        instance.session.responses['/web/searchview/fields_get'] = function () {
             return {result: {fields: {
                 dummy: {type: 'char', string: 'Dummy'}
             }}};
@@ -321,7 +321,7 @@ $(document).ready(function () {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, 'name_get',
                   "m2o should resolve default id");
             equal(req.params.model, f.attrs.relation,
@@ -357,7 +357,7 @@ $(document).ready(function () {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
            return {result: []};
         };
         f.facet_for_defaults({dummy: id})
@@ -573,7 +573,7 @@ $(document).ready(function () {
             });
     });
     asyncTest("M2O", 15, function () {
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, "name_search");
             equal(req.params.model, "dummy.model");
             deepEqual(req.params.args, []);
@@ -607,7 +607,7 @@ $(document).ready(function () {
             });
     });
     asyncTest("M2O no match", 5, function () {
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, "name_search");
             equal(req.params.model, "dummy.model");
             deepEqual(req.params.args, []);
@@ -1070,7 +1070,7 @@ $(document).ready(function () {
     });
     asyncTest('checkboxing', 6, function () {
         var view = makeSearchView();
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: [{
                 name: "filter name",
                 user_id: 42
@@ -1099,7 +1099,7 @@ $(document).ready(function () {
     });
     asyncTest('removal', 1, function () {
         var view = makeSearchView();
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: [{
                 name: "filter name",
                 user_id: 42

addons/web/static/test/testing.js

@@ -33,28 +33,28 @@ openerp.testing = (function () {
             instance.web.qweb.add_template(doc);
         },
         /**
-         * Alter provided instance's ``connection`` attribute to make response
+         * Alter provided instance's ``session`` attribute to make response
          * mockable:
          *
          * * The ``responses`` parameter can be used to provide a map of (RPC)
          *   paths (e.g. ``/web/view/load``) to a function returning a response
          *   to the query.
-         * * ``instance,connection`` grows a ``responses`` attribute which is
+         * * ``instance.session`` grows a ``responses`` attribute which is
          *   a map of the same (and is in fact initialized to the ``responses``
          *   parameter if one is provided)
          *
          * Note that RPC requests to un-mocked URLs will be rejected with an
          * error message: only explicitly specified urls will get a response.
          *
-         * Mocked connections will *never* perform an actual RPC connection.
+         * Mocked sessions will *never* perform an actual RPC connection.
          *
          * @param instance openerp instance being initialized
          * @param {Object} [responses]
          */
         mockifyRPC: function (instance, responses) {
-            var connection = instance.connection;
+            var session = instance.session;
-            connection.responses = responses || {};
+            session.responses = responses || {};
-            connection.rpc_function = function (url, payload) {
+            session.rpc_function = function (url, payload) {
                 var fn = this.responses[url.url + ':' + payload.params.method]
                       || this.responses[url.url];
 

addons/web_api/__openerp__.py

@@ -0,0 +1,13 @@
+{
+    "name" : "OpenERP Web API",
+    "category" : "Hidden",
+    "description":"""Openerp Web API.""",
+    "version" : "2.0",
+    "depends" : ['web'],
+    "installable" : True,
+    'auto_install': False,
+    'js' : [
+    ],
+    'css' : [
+    ],
+}

addons/web_api/i18n/es_CR.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 

addons/web_api/static/src/example.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html style="height: 100%"> 
+    <head> 
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
+        <style type="text/css">
+        body {
+            font-family: sans-serif;
+        }
+        pre.run {
+            border: 1px solid black; margin:0;padding:8px;
+        }
+        .result {
+            border: 1px solid black; margin:0;padding:8px;
+        }
+        </style>
+        <title>OpenERP web_api example</title> 
+        <script type="text/javascript" src="/web/webclient/js"></script> 
+        <script type="text/javascript">
+        $(function() {
+            $("body").on('click','button',function(ev){
+                eval($("pre.run").text());
+            });
+        });
+        </script> 
+    </head> 
+    <body>
+        <h1>OpenERP web_api examples</h1>
+        <h2>Example 1: Load the list of defined ir.model <button>Run it !</button></h2>
+        <blockquote>
+        <h3>Code: </h3>
+        <pre>
+&lt;script type="text/javascript" src="/web/webclient/js"&gt;&lt;/script&gt;
+&lt;script type="text/javascript"&gt;
+<pre id="ex1" class="run">
+    var instance = openerp.init(["web"]); // get a new instance
+    instance.session.session_bind(); // bind it to the right hostname
+    instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
+        var ds = new instance.web.DataSetSearch(null, "ir.model");
+        ds.read_slice(['name','model'], {}).then(function(models){
+            _.each(models,function(m,i){
+                $("#ex1res").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
+            });
+        });
+    });
+</pre>&lt;/script&gt;
+        </pre>
+        <h3>Div for output:</h3>
+        <div id="ex1res" class="result">
+        &nbsp;
+        </div>
+        </blockquote>
+        <h2>Help me to complete this examples on <a href="http://bazaar.launchpad.net/~openerp/openerp-web/trunk/view/head:/addons/web_api/static/src/example.html">launchpad</a></h2>
+    </body> 
+</html> 
+

addons/web_calendar/i18n/ar.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/bg.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/bn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/bs.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/ca.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/cs.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web

addons/web_calendar/i18n/da.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/de.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/en_AU.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/en_GB.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/es.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/es_CL.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/es_CR.po

@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 "Language: es\n"
 
 #. openerp-web

addons/web_calendar/i18n/es_EC.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/et.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/eu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/fi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/fr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/fr_CA.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/gl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/hr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/id.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/it.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/ja.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/ka.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/mk.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11

addons/web_calendar/i18n/mn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Generator: Launchpad (build 15801)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11