diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 2697ce97475..5a4c921950f 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -280,7 +280,7 @@ var ScaleScreenWidget = ScreenWidget.extend({ return self.pos.proxy.scale_read().then(function(weight){ self.set_weight(weight.weight); }); - },{duration:50, repeat: true}); + },{duration:150, repeat: true}); }, get_product: function(){ diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js index 48f990de948..1a3f9e6a1cc 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -1208,7 +1208,7 @@ var One2ManyListView = X2ManyListView.extend({ this.dataset.x2m.internal_dataset_changed = false; var self = this; - return this.save_edition().done(function () { + return this.save_edition(true).done(function () { if (self._dataset_changed) { self.dataset.trigger('dataset_changed'); } diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 178e999377f..6f8e4b973a4 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -448,7 +448,7 @@ ListView.include(/** @lends instance.web.ListView# */{ /** * @return {jQuery.Deferred} */ - save_edition: function () { + save_edition: function (cancel_onfail) { var self = this; return self.saving_mutex.exec(function() { if (!self.editor.is_editing()) { @@ -483,7 +483,9 @@ ListView.include(/** @lends instance.web.ListView# */{ return {created: created, record: record}; }); }, function() { - return self.cancel_edition(); + if (cancel_onfail) { + return self.cancel_edition(); + } }); }); });