From 8d7837c035e4392bb50ab1fce06759c92160a2c7 Mon Sep 17 00:00:00 2001 From: wan Date: Fri, 13 Sep 2019 08:57:17 +0000 Subject: [PATCH] [FIX] account: removing a line produced by a model If a line was produced by a reconciliaion model, it shouldn't be put back in the reconciliation propositions because a rpc request would not give it back. Also, the line is not correctly formatted. closes odoo/odoo#36826 Signed-off-by: Cedric Snauwaert (csn) --- .../src/js/reconciliation/reconciliation_model.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js index 8903c507020..71e3b46ec43 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_model.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js @@ -588,10 +588,12 @@ var StatementModel = BasicModel.extend({ line.reconciliation_proposition = _.filter(line.reconciliation_proposition, function (p) { return p.id !== prop.id && p.id !== prop.link && p.link !== prop.id && (!p.link || p.link !== prop.link); }); - if (['receivable', 'payable', 'liquidity'].includes(prop.account_type)) { - line.mv_lines_match_rp.unshift(prop); - } else { - line.mv_lines_match_other.unshift(prop); + if (prop['reconcileModelId'] === undefined) { + if (['receivable', 'payable', 'liquidity'].includes(prop.account_type)) { + line.mv_lines_match_rp.unshift(prop); + } else { + line.mv_lines_match_other.unshift(prop); + } } // No proposition left and then, reset the st_line partner.