[MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824085918-y69p2653fsqw5t9y

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 112e64d..d07b5d7 100644 (file)
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -200,7 +200,6 @@ class res_partner_bank(osv.osv):
                             val._data[val.id]['bank_name'] = _('BANK')
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
-                        result += ' [Formatting Error]'
                         raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
             res.append((val.id, result))
         return res