From 05fe5384feea4e0b864964ae3b6b0603e982fea3 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 29 Dec 2017 12:00:48 +0100 Subject: [PATCH] [FIX] account: manual reconciliation open the first line when validate the opening is done even when there is still an open line --- .../static/src/js/reconciliation/reconciliation_action.js | 6 +++++- addons/account/static/tests/reconciliation_tests.js | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/account/static/src/js/reconciliation/reconciliation_action.js b/addons/account/static/src/js/reconciliation/reconciliation_action.js index 1f525eb0676..1db30c9eba6 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_action.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_action.js @@ -359,7 +359,11 @@ var ManualAction = StatementAction.extend({ title: self.title, time: Date.now()-self.time, }); - self._openFirstLine(); + if(!_.any(result.updated, function (handle) { + return self.model.getLine(handle).mode !== 'inactive'; + })) { + self._openFirstLine(); + } }); }, }); diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js index ec763da8a3d..4bf1708cb4c 100644 --- a/addons/account/static/tests/reconciliation_tests.js +++ b/addons/account/static/tests/reconciliation_tests.js @@ -1144,7 +1144,7 @@ QUnit.module('account', { }); QUnit.test('Reconciliation manual', function (assert) { - assert.expect(12); + assert.expect(13); var clientAction = new ReconciliationClientAction.ManualAction(null, this.params.options); @@ -1182,6 +1182,9 @@ QUnit.module('account', { assert.strictEqual(clientAction.$('.o_reconciliation_line:eq(1) .o_reconcile:visible').length, 1, "should display 'Reconcile' button in green"); clientAction.$('.o_reconciliation_line:eq(1) .o_reconcile:visible').trigger('click'); + + assert.strictEqual(clientAction.$('.o_reconciliation_line[data-mode!="inactive"]').length, 1, "should have only one line open"); + clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="23"] .cell_label').trigger('click'); clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="24"] .cell_label').trigger('click');