[MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824063338-xjf9tt2or8mp6kcg

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 95f05cf..6c65409 100644 (file)
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -201,7 +201,7 @@ class res_partner_bank(osv.osv):
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
-                        raise osv.except_osv(_("Warning"), _("You cannot avoid default format_layout to result in True"))
+                        raise osv.except_osv(_("Error"), _("You cannot avoid default format_layout to result in True"))
             res.append((val.id, result))
         return res