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

[IMP]: base: changed name get for partner address to display in order: name, country, city, street (no zip) 

bzr revid: rpa@tinyerp.com-20100719132948-v7c78zh2e440vct3
This commit is contained in:
rpa (Open ERP) 2010-07-19 18:59:48 +05:30
parent afa0a6dc06
commit 3aadb0ad29
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/addons/base/res/partner/partner.py
View File

@ -302,9 +302,9 @@ class res_partner_address(osv.osv):
res.append((r['id'], r['partner_id'][1]))
else:
addr = r['name'] or ''
if r['name'] and (r['zip'] or r['country_id']):
if r['name'] and (r['city'] or r['country_id']):
addr += ', '
addr += (r['zip'] or '') + ' ' + (r['city'] or '') + ' ' + (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['street'] or '')
addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' ' + (r['street'] or '')
res.append((r['id'], addr.strip() or '/'))
return res