[MERGE] forward port branch saas-11.2 up to b170a753e18

2 files changed, 4 insertions, 4 deletions

diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js
index 3492af748f5..f502f37be94 100644
--- a/addons/web/static/src/js/chrome/abstract_web_client.js
+++ b/addons/web/static/src/js/chrome/abstract_web_client.js
@@ -178,7 +178,7 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, KeyboardNavigationMi
         core.bus.on('connection_restored', this, this.on_connection_restored);
 
         // crash manager integration
-        session.on('error', crash_manager, crash_manager.rpc_error);
+        core.bus.on('rpc_error', crash_manager, crash_manager.rpc_error);
         window.onerror = function (message, file, line, col, error) {
             // Scripts injected in DOM (eg: google API's js files) won't return a clean error on window.onerror.
             // The browser will just give you a 'Script error.' as message and nothing else for security issue.
diff --git a/addons/web/static/src/js/chrome/loading.js b/addons/web/static/src/js/chrome/loading.js
index 0c1b5e5025f..6c7f102231b 100644
--- a/addons/web/static/src/js/chrome/loading.js
+++ b/addons/web/static/src/js/chrome/loading.js
@@ -26,9 +26,9 @@ var Loading = Widget.extend({
         this._super(parent);
         this.count = 0;
         this.blocked_ui = false;
-        session.on("request", this, this.request_call);
-        session.on("response", this, this.response_call);
-        session.on("response_failed", this, this.response_call);
+        core.bus.on('rpc_request', this, this.request_call);
+        core.bus.on("rpc_response", this, this.response_call);
+        core.bus.on("rpc_response_failed", this, this.response_call);
     },
     destroy: function() {
         this.on_rpc_event(-this.count);