[MERGE] Merged lp:~openerp-dev/openerp-web/7.0-pos-improvements-fva (using -r 3867...

[odoo/odoo.git] / addons / web / static / src / js / corelib.js

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 116ddf2..1575065 100644 (file)
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1011,6 +1011,9 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var deferred = $.Deferred();
         if (! options.shadow)
             this.trigger('request', url, payload);
+        
+        if (options.timeout)
+            url.timeout = options.timeout;
 
         this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {