[FIX] account: Bank statement reconciliation
To avoid to reset the partial reconciliation when the number of selected lines is different to 1.
This commit is contained in:
parent
2749f73f9b
commit
cccb2351c4
|
@ -1410,6 +1410,12 @@ openerp.account = function (instance) {
|
||||||
mvLinesSelectedChanged: function(elt, val) {
|
mvLinesSelectedChanged: function(elt, val) {
|
||||||
var self = this;
|
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 added_lines = _.difference(val.newValue, val.oldValue);
|
||||||
var removed_lines = _.difference(val.oldValue, val.newValue);
|
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 mv_lines_selected = self.get("mv_lines_selected");
|
||||||
var lines_selected_num = mv_lines_selected.length;
|
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
|
// Compute balance
|
||||||
var balance = 0;
|
var balance = 0;
|
||||||
balance -= self.st_line.amount;
|
balance -= self.st_line.amount;
|
||||||
|
|
Loading…
Reference in New Issue