From 5a224497a99789b0776a48edb0d884bcdf683d53 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 25 Aug 2015 09:30:06 +0200 Subject: [PATCH] [FIX] account: proposed invoices In bank statement reconciliation, when selecting an other partner(with the pencil), the possible invoices to reconcile must be suggested. opw:647210, 647885 --- addons/account/static/src/js/account_widgets.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js index 64d7beaf8f3..3291cb6ab3c 100644 --- a/addons/account/static/src/js/account_widgets.js +++ b/addons/account/static/src/js/account_widgets.js @@ -1186,10 +1186,13 @@ openerp.account = function (instance) { changePartnerClickHandler: function() { var self = this; - self.$(".change_partner_container").find("input").attr("placeholder", self.st_line.partner_name); + var partner_name = self.st_line.partner_name; self.$(".change_partner_container").show(); self.$(".partner_name").hide(); - self.change_partner_field.$drop_down.trigger("click"); + self.changePartner(false).then(function(){ + self.$(".change_partner_container").find("input").attr("placeholder", partner_name); + self.change_partner_field.$drop_down.trigger("click"); + }) }, @@ -1614,10 +1617,9 @@ openerp.account = function (instance) { // Update model .call("write", [[self.st_line_id], {'partner_id': partner_id}]) .then(function () { - self.do_load_reconciliation_proposition = false; // of the server might set the statement line's partner + self.do_load_reconciliation_proposition = true; // the server will set the statement line with the new partner self.animation_speed = 0; return $.when(self.restart(self.get("mode"))).then(function(){ - self.do_load_reconciliation_proposition = true; self.is_consistent = true; self.set("mode", "match"); });