[MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824055833-8xbhra27zvke35pm

diff --cc openerp/addons/base/res/res_bank.py
index 3ef9188,c5c05c1..95f05cf
--- 1/openerp/addons/base/res/res_bank.py
--- 2/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@@ -187,10 -198,10 +198,10 @@@ class res_partner_bank(osv.osv)
                          # avoid the default format_layout to result in "False: ..."
                          if not val._data[val.id]['bank_name']:
                              val._data[val.id]['bank_name'] = _('BANK')
-                         result = t.format_layout % val._data[val.id]
+                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                      except:
                          result += ' [Formatting Error]'
 -                        raise
 +                        raise osv.except_osv(_("Warning"), _("You cannot avoid default format_layout to result in True"))
              res.append((val.id, result))
          return res