From b323194275641f1f316d02bfe3481b7aaad9d84a Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Tue, 29 Jan 2013 11:46:00 +0100 Subject: [PATCH 1/2] [FIX] Added invisible state fields as in path cha lp bug: https://launchpad.net/bugs/1068822 fixed bzr revid: jco@openerp.com-20130129104600-2jjbwbxgw10a4u7e --- addons/l10n_fr_rib/bank.py | 1 + addons/l10n_fr_rib/bank_view.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/l10n_fr_rib/bank.py b/addons/l10n_fr_rib/bank.py index 8ad86932a34..41a0f6889ce 100644 --- a/addons/l10n_fr_rib/bank.py +++ b/addons/l10n_fr_rib/bank.py @@ -69,6 +69,7 @@ class res_partner_bank(osv.osv): value['bank_code'] = bank.rib_code return result + _columns = { 'acc_number': fields.char('Account Number', size=64, required=False), 'rib_acc_number': fields.char('RIB account number', size=11, readonly=True,), diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml index 414ad51954a..e93f9b83abc 100644 --- a/addons/l10n_fr_rib/bank_view.xml +++ b/addons/l10n_fr_rib/bank_view.xml @@ -10,6 +10,7 @@ + @@ -25,7 +26,7 @@ - + @@ -40,6 +41,7 @@ + From 02908db00280dee03400eb425c4624eb807d4ef6 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Tue, 29 Jan 2013 13:41:51 +0100 Subject: [PATCH 2/2] name journal when bank account number does not exist bzr revid: jco@openerp.com-20130129124151-ywtwxgpu4ciwl9sp --- addons/account/account_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index f2bc9a5c9a1..aadf3ca85ad 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -41,7 +41,7 @@ class bank(osv.osv): def _prepare_name(self, bank): "Return the name to use when creating a bank journal" - return (bank.bank_name or '') + ' ' + bank.acc_number + return (bank.bank_name or '') + ' ' + bank.acc_number or '' def _prepare_name_get(self, cr, uid, bank_dicts, context=None): """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""