[MERGE] forward port branch saas-14 up to 4e90a676da

This commit is contained in:
Christophe Simonis
2018-05-04 14:19:53 +02:00
3 changed files with 18 additions and 3 deletions
-2
View File
@@ -931,8 +931,6 @@ class AccountMoveLine(models.Model):
raise UserError(_('Entries are not of the same account!'))
if not (all_accounts[0].reconcile or all_accounts[0].internal_type == 'liquidity'):
raise UserError(_('The account %s (%s) is not marked as reconciliable !') % (all_accounts[0].name, all_accounts[0].code))
if len(partners) > 1:
raise UserError(_('The partner has to be the same on all lines for receivable and payable accounts!'))
#reconcile everything that can be
remaining_moves = self.auto_reconcile_lines()
+7 -1
View File
@@ -315,7 +315,7 @@ var ListView = View.extend({
this._limit = new_state.limit;
this.current_min = new_state.current_min;
this.reload_content().then(function() {
this.reload_content_when_ready().then(function() {
// Reset the scroll position to the top on page changed only
if (!limit_changed) {
self.set_scrollTop(0);
@@ -452,6 +452,12 @@ var ListView = View.extend({
});
return reloaded.promise();
}),
/**
* Proxy allowing override when reload_content can't be called directly
*/
reload_content_when_ready: function() {
return this.reload_content.apply(this, arguments);
},
reload: function () {
return this.reload_content();
},
@@ -400,6 +400,17 @@ ListView.include(/** @lends instance.web.ListView# */{
});
return cells;
},
/**
* Prevent reloading content while an ongoing save
*/
reload_content_when_ready: function() {
var self = this;
var self_super = this._super;
var original_arguments = arguments;
return this.saving_mutex.exec(function() {
return self_super.apply(self, original_arguments);
});
},
/**
* If currently editing a row, resizes all registered form fields based
* on the corresponding row cell