[MERGE] forward port branch 11.0 up to 950d9b23690

1 files changed, 5 insertions, 2 deletions

diff --git a/addons/website_form/static/src/js/website_form.js b/addons/website_form/static/src/js/website_form.js
index aa540650473..47ba66c244b 100644
--- a/addons/website_form/static/src/js/website_form.js
+++ b/addons/website_form/static/src/js/website_form.js
@@ -22,7 +22,7 @@ odoo.define('website_form.animation', function (require) {
 
         start: function () {
             var self = this;
-            qweb.add_template('/website_form/static/src/xml/website_form.xml');
+            this.templates_loaded = ajax.loadXML('/website_form/static/src/xml/website_form.xml', qweb);
             this.$target.find('.o_website_form_send').on('click',function (e) {self.send(e);});
 
             // Initialize datetimepickers
@@ -233,7 +233,10 @@ odoo.define('website_form.animation', function (require) {
             if (status !== 'success') {  // Restore send button behavior if result is an error
                 this.$target.find('.o_website_form_send').on('click',function (e) {self.send(e);});
             }
-            this.$target.find('#o_website_form_result').replaceWith(qweb.render("website_form.status_" + status));
+            var $result = this.$('#o_website_form_result');
+            this.templates_loaded.done(function () {
+                $result.replaceWith(qweb.render("website_form.status_" + status));
+            });
         },
     });
 });