[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 0771996..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':
@@ -139,6 +139,7 @@ class res_partner_bank(osv.osv):
         'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
             change_default=True),
         'sequence': fields.integer('Sequence'),
+        'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
     }
 
     _defaults = {
@@ -198,9 +199,8 @@ 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:
-                        result += ' [Formatting Error]'
-                        raise
+                    except Exception:
+                        raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
             res.append((val.id, result))
         return res
 
@@ -211,6 +211,7 @@ class res_partner_bank(osv.osv):
             if c.partner_id:
                 r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context)
                 r['value']['partner_id'] = c.partner_id.id
+                r['value']['footer'] = 1
                 result = r
         return result