From 2c0b28c27a51e7fa5d87b4b2df8730fa60c85fd6 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 23 Nov 2012 10:53:37 +0100 Subject: [PATCH 1/2] [FIX]traceback when trying to add bank account to a company bzr revid: csn@openerp.com-20121123095337-jqoqzpab4iyreh2s --- addons/account/account_bank.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index 2323f8aaa8a..002e08bb2f3 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -45,12 +45,12 @@ class bank(osv.osv): def _prepare_name_get(self, cr, uid, bank_dicts, context=None): """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type""" - currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id'])) + currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if 'currency_id' in data)) currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context) currency_name = dict((currency.id, currency.name) for currency in currencies) for data in bank_dicts: - data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or '' + data['currency_name'] = data.get('currency_id') and currency_name[data['currency_id'][0]] or '' return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context) def post_write(self, cr, uid, ids, context=None): From 8ccbcb8171fc14ca5f75c2e0770985a82eed7f46 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 23 Nov 2012 11:36:57 +0100 Subject: [PATCH 2/2] [FIX]gave an error if data['currency_id'] exists but has value false bzr revid: csn@openerp.com-20121123103657-jgewk23zrz3xo5ty --- addons/account/account_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index 002e08bb2f3..c836600d866 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -45,7 +45,7 @@ class bank(osv.osv): def _prepare_name_get(self, cr, uid, bank_dicts, context=None): """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type""" - currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if 'currency_id' in data)) + currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data.get('currency_id'))) currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context) currency_name = dict((currency.id, currency.name) for currency in currencies)