[MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824085918-y69p2653fsqw5t9y
This commit is contained in:
Twinkle Christian (OpenERP)
2012-08-24 14:29:18 +05:30
parent a932d1dc00
commit 7e59db5f0f
-1
View File
@@ -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