From 891ef5786ba7d35102d4ac491f043ac549a30aae Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Fri, 6 Jul 2012 15:36:41 +0530 Subject: [PATCH 1/5] [FIX]res_bank.py bzr revid: tch@tinyerp.com-20120706100641-idkoar0ruwinlb8b --- openerp/addons/base/res/res_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index c9010b64319..3ef9188475f 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -190,7 +190,7 @@ class res_partner_bank(osv.osv): result = t.format_layout % val._data[val.id] 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 From 041b29e164a8a1737c5f11ee8447672fbcb3b474 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Fri, 24 Aug 2012 12:03:38 +0530 Subject: [PATCH 2/5] [MERGE]merge with main branch bzr revid: tch@tinyerp.com-20120824063338-xjf9tt2or8mp6kcg --- openerp/addons/base/res/res_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 95f05cf89d6..6c654097d15 100644 --- 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 From 523a7610c413d15fbfec104a8aa4c9d9de92085e Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Fri, 24 Aug 2012 12:39:07 +0530 Subject: [PATCH 3/5] [MERGE]merge with main branch bzr revid: tch@tinyerp.com-20120824070907-g6g6jpkj2t10kals --- openerp/addons/base/res/res_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 6c654097d15..dbf098f3535 100644 --- 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(_("Error"), _("You cannot avoid default format_layout to result in True")) + raise osv.except_osv(_("Formating Error"), _("Invalid Bank name")) res.append((val.id, result)) return res From a932d1dc0069e13cd26b113c90aed0d4b3320ff4 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Fri, 24 Aug 2012 14:12:32 +0530 Subject: [PATCH 4/5] [MERGE]merge with main branch bzr revid: tch@tinyerp.com-20120824084232-8b0x7euh7m9f0yor --- openerp/addons/base/res/res_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index dbf098f3535..112e64de812 100644 --- 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(_("Formating Error"), _("Invalid Bank name")) + raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format.")) res.append((val.id, result)) return res From 7e59db5f0f04dfc165131566f2284d575e194fe6 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Fri, 24 Aug 2012 14:29:18 +0530 Subject: [PATCH 5/5] [MERGE]merge with main branch bzr revid: tch@tinyerp.com-20120824085918-y69p2653fsqw5t9y --- openerp/addons/base/res/res_bank.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 112e64de812..d07b5d712f7 100644 --- 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