From 8d8ede7f7d075c29f903b2714028c009b7a337ec Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 20 Feb 2014 16:08:17 +0100
Subject: [PATCH] [FIX] Disable traceback popup when rpc /calendar/notify fail

bzr revid: jke@openerp.com-20140220150817-0yyovkr4ooqu8ejc
---
 addons/calendar/static/src/js/base_calendar.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index 18fd4dfa20e..4384964575c 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -11,7 +11,7 @@ openerp.calendar = function(instance) {
         get_next_notif: function() {
             var self= this;
             this.rpc("/calendar/notify")
-            .then(
+            .done(
                 function(result) {
                     _.each(result,  function(res) {
                         setTimeout(function() {
@@ -44,6 +44,12 @@ openerp.calendar = function(instance) {
                         },res.timer * 1000);
                     });
                 }
+            )
+            .fail(
+                // To override error from framework.js in RPC function
+                function(error, event) {
+                    event.preventDefault();
+                }
             );
         },
         check_notifications: function() {
@@ -51,14 +57,14 @@ openerp.calendar = function(instance) {
             self.get_next_notif();
             setInterval(function(){
                 self.get_next_notif();
-            }, 5 * 60  * 1000 );
+            }, 5 * 60 * 1000 );
         },
         
         //Override the show_application of addons/web/static/src/js/chrome.js       
         show_application: function() {
             this._super();
             this.check_notifications();
-        },        
+        },
     });