Josse Colpaert (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/7.0-bug-1068822-jco-cha into
lp:openobject-addons/7.0.
Requested reviews:
qdp (OpenERP) (qdp)
Related bugs:
Bug #1068822 in OpenERP Addons: "l10n_fr_rib and error message when opening a
Bank Account"
https://bugs.launchpad.net/openobject-addons/+bug/1068822
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1068822-jco-cha/+merge/145372
Next to changes from cha, I also added or '' for the bank account number
somewhere as it is not required generally.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1068822-jco-cha/+merge/145372
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/7.0-bug-1068822-jco-cha.
=== modified file 'account/account_bank.py'
--- account/account_bank.py 2012-12-06 14:56:32 +0000
+++ account/account_bank.py 2013-01-29 14:03:34 +0000
@@ -41,7 +41,7 @@
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"""
=== modified file 'l10n_fr_rib/bank.py'
--- l10n_fr_rib/bank.py 2012-12-06 14:56:32 +0000
+++ l10n_fr_rib/bank.py 2013-01-29 14:03:34 +0000
@@ -69,6 +69,7 @@
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,),
=== modified file 'l10n_fr_rib/bank_view.xml'
--- l10n_fr_rib/bank_view.xml 2012-11-29 22:26:45 +0000
+++ l10n_fr_rib/bank_view.xml 2013-01-29 14:03:34 +0000
@@ -10,6 +10,7 @@
<data>
<xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<field name="rib_acc_number"/>
+ <field name="state" invisible="1"/>
</xpath>
</data>
</field>
@@ -25,7 +26,7 @@
<field name="bank_code" />
<field name="office" />
<newline />
- <field name="rib_acc_number" />
+ <field name="rib_acc_number"/>
<field name="key" />
<newline />
</field>
@@ -40,6 +41,7 @@
<field name="arch" type="xml">
<field name="acc_number" position="after">
<field name="rib_acc_number" />
+ <field name="state" invisible="1"/>
</field>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
