audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[RFR] PEP8

Browse Source 
[RFR] Refactor double check on country_id and country_code
[IMP] Select longest matching partner name if multiple matches
[IMP] Propagate context in get_or_create_partner
This commit is contained in:
Stefan Rijnhart
2013-02-07 10:38:41 +01:00
parent 5bde8a5bc1
commit a11fa72a87
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking/banking_import_transaction.py
View File

@@ -1314,7 +1314,7 @@ class banking_import_transaction(osv.osv):
transaction.remote_owner_address,
transaction.remote_owner_postalcode,
transaction.remote_owner_city,
country_code, results['log']
country_code, results['log'], context=context)
)
if transaction.remote_account:
partner_bank_id = create_bank_account(

41
account_banking/wizard/banktools.py
View File

@@ -19,14 +19,11 @@
#
##############################################################################
import sys
import datetime
import re
from tools.translate import _
from account_banking.parsers import convert
from account_banking import sepa
from account_banking.struct import struct
import unicodedata
__all__ = [
'get_period',
@@ -122,7 +119,7 @@ def _has_attr(obj, attr):
return False
def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
country_code, log):
country_code, log, context=None):
'''
Get or create the partner belonging to the account holders name <name>
@@ -132,15 +129,17 @@ def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
TODO: revive the search by lines from the address argument
'''
partner_obj = pool.get('res.partner')
partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', name)])
partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', name)],
context=context)
country_id = False
if not partner_ids:
# Try brute search on address and then match reverse
criteria = []
if country_code:
country_obj = pool.get('res.country')
country_ids = country_obj.search(
cr, uid, [('code','=',country_code.upper())]
)
cr, uid, [('code', '=', country_code.upper())],
context=context)
country_id = country_ids and country_ids[0] or False
criteria.append(('address.country_id', '=', country_id))
if city:
@@ -148,36 +147,38 @@ def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
if postal_code:
criteria.append(('address.zip', 'ilike', postal_code))
partner_search_ids = partner_obj.search(
cr, uid, criteria)
cr, uid, criteria, context=context)
key = name.lower()
partners = partner_obj.read(cr, uid, partner_search_ids, ['name'])
partner_ids = [x['id'] for x in partners if (
len(x['name']) > 3 and
x['name'].lower() in key)]
partners = []
for partner in partner_obj.read(
cr, uid, partner_search_ids, ['name'], context=context):
if (len(partner['name']) > 3 and partner['name'].lower() in key):
partners.append(partner)
partners.sort(key=lambda x: len(x['name']), reverse=True)
partner_ids = [x['id'] for x in partners]
if not partner_ids:
if (not country_code) or not country_id:
user = pool.get('res.user').browse(cr, uid, uid)
if not country_id:
user = pool.get('res.user').browse(cr, uid, uid, context=context)
country_id = (
user.company_id.partner_id.country and
user.company_id.partner_id.country.id or
False
)
partner_id = partner_obj.create(cr, uid, dict(
name=name, active=True, comment='Generated from Bank Statements Import',
name=name, active=True,
comment='Generated from Bank Statements Import',
address=[(0,0,{
'street': address and address[0] or '',
'street2': len(address) > 1 and address[1] or '',
'city': city,
'zip': postal_code or '',
'country_id': country_id,
})],
))
})]), context=context)
else:
if len(partner_ids) > 1:
log.append(
_('More than one possible match found for partner with name %(name)s')
% {'name': name}
)
_('More than one possible match found for partner with '
'name %(name)s') % {'name': name})
partner_id = partner_ids[0]
return partner_id