[MERGE] forward port branch saas-11 up to b7e4ce93c4

addons/web/static/src/js/view_manager.js

@@ -202,17 +202,19 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
                 });
             }
 
+            self.active_search = $.Deferred();
             // Call do_search on the searchview to compute domains, contexts and groupbys
             if (self.search_view_loaded &&
                     self.flags.auto_search &&
                     view.controller.searchable !== false) {
-                self.active_search = $.Deferred();
                 $.when(self.search_view_loaded, view.loaded).done(function() {
                     self.searchview.do_search();
                 });
+            } else {
+                self.active_search.resolve();
             }
 
-            return $.when(view.loaded, self.active_search)
+            return $.when(view.loaded, self.active_search, self.search_view_loaded)
                 .then(function() {
                     return self._display_view(view_options, old_view).then(function() {
                         self.trigger('switch_mode', view_type, view_options);

odoo/addons/base/ir/ir_cron.py

@@ -89,8 +89,6 @@ class ir_cron(models.Model):
 
         """
         self._cr.rollback()
-        _logger.exception("Call of self.env[%r].%s(*%r) failed in Job %s",
-                          model_name, method_name, args, job_id)
 
     @api.model
     def _callback(self, model_name, method_name, args, job_id):
@@ -127,6 +125,8 @@ class ir_cron(models.Model):
             else:
                 _logger.warning("Model %r does not exist.", model_name)
         except Exception, e:
+            _logger.exception("Call of self.env[%r].%s(*%r) failed in Job #%s",
+                              model_name, method_name, args, job_id)
             self._handle_callback_exception(model_name, method_name, args, job_id, e)
 
     @classmethod