odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] base: change conflicting address-related "State" fields to "Fed. State" 

This will avoid ambiguous translations, until we can
implement some sort of context-sensitive translation
system.

lp bug: https://launchpad.net/bugs/918086 fixed

bzr revid: odo@openerp.com-20120118132900-427nc6j0p4h25bdn
This commit is contained in:
Olivier Dony 2012-01-18 14:29:00 +01:00
parent 34c7e0b08d
commit fbc0545842
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/i18n/base.pot
View File

@ -5940,6 +5940,10 @@ msgstr ""
#. module: base
#: field:res.partner.address,state_id:0
#: field:res.bank,state:0
#: field:res.company,state_id:0
#: view:res.country.state:0
#: field:res.partner.bank,state_id:0
msgid "Fed. State"
msgstr ""
@ -10725,10 +10729,6 @@ msgstr ""
#: field:ir.module.module,state:0
#: field:ir.module.module.dependency,state:0
#: field:publisher_warranty.contract,state:0
#: field:res.bank,state:0
#: field:res.company,state_id:0
#: view:res.country.state:0
#: field:res.partner.bank,state_id:0
#: view:res.request:0
#: field:res.request,state:0
#: field:workflow.instance,state:0

4
openerp/addons/base/res/res_bank.py
View File

@ -31,7 +31,7 @@ class Bank(osv.osv):
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
'state': fields.many2one("res.country.state", 'State',
'state': fields.many2one("res.country.state", 'Fed. State',
domain="[('country_id', '=', country)]"),
'country': fields.many2one('res.country', 'Country'),
'email': fields.char('E-Mail', size=64),
@ -130,7 +130,7 @@ class res_partner_bank(osv.osv):
'city': fields.char('City', size=128),
'country_id': fields.many2one('res.country', 'Country',
change_default=True),
'state_id': fields.many2one("res.country.state", 'State',
'state_id': fields.many2one("res.country.state", 'Fed. State',
change_default=True, domain="[('country_id','=',country_id)]"),
'company_id': fields.many2one('res.company', 'Company',
ondelete='cascade', help="Only if this bank account belong to your company"),

2
openerp/addons/base/res/res_company.py
View File

@ -135,7 +135,7 @@ class res_company(osv.osv):
'street2': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street2", multi='address'),
'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'),
'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),
'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="State", multi='address'),
'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="Fed. State", multi='address'),
'bank_ids': fields.one2many('res.partner.bank','company_id', 'Bank Accounts', help='Bank accounts related to this company'),
'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'),
'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'),