[MERGE] forward port branch saas-11 up to 19b4f5e

1 files changed, 9 insertions, 8 deletions

diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index 5fc1f3f2796..8157270638e 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -58,10 +58,10 @@ return AbstractWebClient.extend({
     toggle_bars: function(value) {
         this.$('tr:has(td.navbar),.oe_leftbar').toggle(value);
     },
-    update_logo: function() {
+    update_logo: function(reload) {
         var company = session.company_id;
         var img = session.url('/web/binary/company_logo' + '?db=' + session.db + (company ? '&company=' + company : ''));
-        this.$('.oe_logo img').attr('src', '').attr('src', img);
+        this.$('.o_sub_menu_logo img').attr('src', '').attr('src', img + (reload ? "#" + Date.now() : ''));
         this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', session.is_superuser);
     },
     logo_edit: function(ev) {
@@ -76,12 +76,13 @@ return AbstractWebClient.extend({
                     action_buttons: true,
                     headless: true,
                 };
-                self.action_manager.do_action(result);
-                var form = self.action_manager.dialog_widget.views.form.controller;
-                form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
-                form.on('record_saved', self, function() {
-                    self.action_manager.dialog_stop();
-                    self.update_logo();
+                self.action_manager.do_action(result).then(function () {
+                    var form = self.action_manager.dialog_widget.views.form.controller;
+                    form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
+                    form.on('record_saved', self, function() {
+                        self.action_manager.dialog_stop();
+                        self.update_logo();
+                    });
                 });
             });
         });