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

[FIX] account_banking: fixed some coding mistakes

Browse Source 
[FIX] account_banking: added missing logic path
This commit is contained in:
Pieter J. Kersten
2010-03-12 15:10:25 +01:00
parent 27c4f49cf1
commit 9d65a1626f
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking/wizard/bank_import.py
View File

@@ -456,7 +456,7 @@ class banking_import(wizard.interface):
partner_bank_id = partner_bank.id
elif transaction.remote_owner:
partner_id = get_or_create_partner(
self.pool, cursor, uid, transaction.remote_owner
self.pool, cursor, uid, transaction.remote_owner, log
)
if transaction.remote_account:
partner_bank_id = create_bank_account(

30
account_banking/wizard/banktools.py
View File

@@ -133,7 +133,7 @@ def get_or_create_partner(pool, cursor, uid, name, log):
return False
else:
partner_id = partner_ids[0]
return partner_obj.browse(cursor, uid, partner_id)[0]
return partner_id
def get_company_bank_account(pool, cursor, uid, account_number, currency,
company, log):
@@ -262,19 +262,27 @@ def create_bank_account(pool, cursor, uid, partner_id,
)
bankcode = None
bic = None
country_obj = pool.get('res.country')
# Are we dealing with IBAN?
iban = sepa.IBAN(account_number)
if iban.valid:
# Take as much info as possible from IBAN
values.state = 'iban'
values.iban = str(iban)
values.acc_number = iban.BBAN
bankcode = iban.bankcode + iban.countrycode
country_ids = country_obj.search(cursor, uid,
[('code', '=', iban.countrycode)]
)
country_id = country_ids[0]
else:
# No, try to convert to IBAN
country = pool.get('res.partner').browse(
cursor, uid, partner_id).country_id
values.state = 'bank'
values.acc_number = account_number
country = pool.get('res.partner').browse(
cursor, uid, partner_id).country_id
country_id = country.id
if country.code in sepa.IBAN.countries:
account_info = sepa.online.account_info(country.code,
values.acc_number
@@ -302,14 +310,18 @@ def create_bank_account(pool, cursor, uid, partner_id,
bank_obj.write(cursor, uid, values.bank_id, dict(bic=bic))
else:
# New bank - create
values.bank_id = bank_obj.create(cursor, uid, dict(
code = account_info.code,
res = struct(country_id=country_id)
if account_info:
res.code = account_info.code
# Only the first eight positions of BIC are used for bank
# transfers, so ditch the rest.
bic = account_info.bic[:8],
name = account_info.bank,
country_id = country.id,
))
res.bic = account_info.bic[:8]
res.name = account_info.bank
else:
res.code = bankcode
res.name = _('Unknown Bank')
values.bank_id = bank_obj.create(cursor, uid, res)
# Create bank account and return
return pool.get('res.partner.bank').create(cursor, uid, values)