[MERGE] base: raise an exception if the format of the bank account is wrong

[odoo/odoo.git] / openerp / addons / base / res / res_bank.py

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index d07b5d7..3bfbd82 100644 (file)
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -109,7 +109,7 @@ class res_partner_bank(osv.osv):
         if not context.get('address'):
             return value
 
-        for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
+        for address in self.pool.get('res.partner').resolve_2many_commands(
             cursor, user, 'address', context['address'], ['type', field], context=context):
 
             if address.get('type') == 'default':
@@ -199,7 +199,7 @@ class res_partner_bank(osv.osv):
                         if not val._data[val.id]['bank_name']:
                             val._data[val.id]['bank_name'] = _('BANK')
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
-                    except:
+                    except Exception:
                         raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
             res.append((val.id, result))
         return res