diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-11 12:17:29 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-11 12:17:29 +0200 |
| commit | e5b0cd2091e53c5e0e08fc94461ebfb1797ce7dd (patch) | |
| tree | dacddf7a634c97f15c8f387209c5f63d4573d91f | |
| parent | bd418d19b1a7fe51445034900f18dc2e1c5e1a3d (diff) | |
[IMP] Address Format in Reports
bzr revid: fp@tinyerp.com-20120911101729-iv79hos2mwxopitq
| -rw-r--r-- | openerp/addons/base/res/res_partner.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 906f4b2b6c6..c5dbd53a15e 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -498,7 +498,7 @@ class res_partner(osv.osv): # get the information that will be injected into the display format # get the address format address_format = address.country_id and address.country_id.address_format or \ - '%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s' + "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s" args = { 'state_code': address.state_id and address.state_id.code or '', 'state_name': address.state_id and address.state_id.name or '', @@ -511,10 +511,10 @@ class res_partner(osv.osv): args[field] = getattr(address, field) or '' if without_company: args['company_name'] = '' + elif address.parent_id: + address_format = '%(company_name)s\n' + address_format return address_format % args - - # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version class res_partner_address(osv.osv): _table = "res_partner" |