[MERGE] forward port branch saas-14 up to bac4d13d47a

2 files changed, 6 insertions, 4 deletions

diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 413415c9f5f..6c1fc81280e 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -61,8 +61,8 @@ class MailComposeMessage(models.TransientModel):
                 mail_values = res[res_id]
                 if mail_values.get('email_to'):
                     recips = tools.email_split(mail_values['email_to'])
-                elif mail_values.get('recipient_ids') and partners_email.get(res_id):
-                    recips = tools.email_split(partners_email[res_id])
+                else:
+                    recips = tools.email_split(partners_email.get(res_id))
                 mail_to = recips[0].lower() if recips else False
                 if (blacklist and mail_to in blacklist) or (seen_list and mail_to in seen_list):
                     # prevent sending to blocked addresses that were included by mistake
diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index dd6c2354156..a351a813263 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/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);