From cccb2351c44a69dbd727e50e6ea6a57b6d0f044e Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 3 Dec 2015 11:24:07 +0100 Subject: [PATCH] [FIX] account: Bank statement reconciliation To avoid to reset the partial reconciliation when the number of selected lines is different to 1. --- addons/account/static/src/js/account_widgets.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js index 0b27139067a..55fe12d362f 100644 --- a/addons/account/static/src/js/account_widgets.js +++ b/addons/account/static/src/js/account_widgets.js @@ -1409,6 +1409,12 @@ openerp.account = function (instance) { mvLinesSelectedChanged: function(elt, val) { var self = this; + + // Reset partial reconciliation + _.each(self.get("mv_lines_selected"), function(line) { + if (line.partial_reconcile === true) self.unpartialReconcileLine(line); + if (line.propose_partial_reconcile === true) line.propose_partial_reconcile = false; + }); var added_lines = _.difference(val.newValue, val.oldValue); var removed_lines = _.difference(val.oldValue, val.newValue); @@ -1557,15 +1563,6 @@ openerp.account = function (instance) { var mv_lines_selected = self.get("mv_lines_selected"); var lines_selected_num = mv_lines_selected.length; - // Undo partial reconciliation if necessary - if (lines_selected_num !== 1) { - _.each(mv_lines_selected, function(line) { - if (line.partial_reconcile === true) self.unpartialReconcileLine(line); - if (line.propose_partial_reconcile === true) line.propose_partial_reconcile = false; - }); - self.updateAccountingViewMatchedLines(); - } - // Compute balance var balance = 0; balance -= self.st_line.amount;