From dbaa614c812797c72694c87ab0149a9c0fcb57f9 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 4 Dec 2012 22:06:02 +0100 Subject: [PATCH 1/2] [FIX] Import fails if two partners exist with same name as on the statement --- account_banking/wizard/banktools.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/account_banking/wizard/banktools.py b/account_banking/wizard/banktools.py index cebf60259..fc48aaa64 100644 --- a/account_banking/wizard/banktools.py +++ b/account_banking/wizard/banktools.py @@ -177,13 +177,12 @@ def get_or_create_partner(pool, cursor, uid, name, address, postal_code, city, 'country_id': country_id, })], )) - elif len(partner_ids) > 1: - log.append( - _('More then one possible match found for partner with name %(name)s') - % {'name': name} - ) - return False else: + if len(partner_ids) > 1: + log.append( + _('More then one possible match found for partner with name %(name)s') + % {'name': name} + ) partner_id = partner_ids[0] return partner_id From 038a355ea737dadb45dce8ccf342385b87aa28fa Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 5 Dec 2012 08:22:19 +0100 Subject: [PATCH 2/2] [FIX] Typo and docstring --- account_banking/wizard/banktools.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/account_banking/wizard/banktools.py b/account_banking/wizard/banktools.py index fc48aaa64..c8b1ce0e3 100644 --- a/account_banking/wizard/banktools.py +++ b/account_banking/wizard/banktools.py @@ -125,6 +125,9 @@ def get_or_create_partner(pool, cursor, uid, name, address, postal_code, city, country_code, log): ''' Get or create the partner belonging to the account holders name + + If multiple partners are found with the same name, select the first and + add a warning to the import log. ''' partner_obj = pool.get('res.partner') partner_ids = partner_obj.search(cursor, uid, [('name', 'ilike', name)]) @@ -180,7 +183,7 @@ def get_or_create_partner(pool, cursor, uid, name, address, postal_code, city, else: if len(partner_ids) > 1: log.append( - _('More then one possible match found for partner with name %(name)s') + _('More than one possible match found for partner with name %(name)s') % {'name': name} ) partner_id = partner_ids[0]