[MERGE] forward port of branch saas-10 up to b26fd22

2 files changed, 3 insertions, 2 deletions

diff --git a/addons/web/static/src/js/compatibility.js b/addons/web/static/src/js/compatibility.js
index 7fa2d4733db..fe3ef096d63 100644
--- a/addons/web/static/src/js/compatibility.js
+++ b/addons/web/static/src/js/compatibility.js
@@ -88,6 +88,7 @@ openerp.web.form.FieldMany2One = core.form_widget_registry.get('many2one');
 openerp.web.form.FormWidget = form_common.FormWidget;
 openerp.web.form.tags = make_old_registry(core.form_tag_registry);
 openerp.web.form.widgets = make_old_registry(core.form_widget_registry);
+openerp.web.form.custom_widgets = make_old_registry(core.form_custom_registry);
 
 openerp.web.format_value = formats.format_value;
 openerp.web.FormView = FormView;
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index d72b83bf347..5e90016acf2 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -655,9 +655,9 @@ var FormView = View.extend(common.FieldManagerMixin, {
             return;
         }
         this.disable_button();
-        return this.save().done(function(result) {
+        return this.save().then(function(result) {
             self.trigger("save", result);
-            self.reload().then(function() {
+            return self.reload().then(function() {
                 self.to_view_mode();
                 core.bus.trigger('do_reload_needaction');
                 core.bus.trigger('form_view_saved', self);