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

fix 

bzr revid: fp@tinyerp.com-20101018132658-j5byga520ep4hsze
This commit is contained in:
Fabien Pinckaers 2010-10-18 15:26:58 +02:00
parent 1ae6ee2693
commit 292908690a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ class res_partner_address(osv.osv):
if r['name'] and (r['city'] or r['country_id']):
addr += ', '
addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' ' + (r['street'] or '')
if context.get('contact_display', 'contact')=='partner_address':
if (context.get('contact_display', 'contact')=='partner_address') and r['partner_id']:
res.append((r['id'], "%s: %s" % (r['partner_id'][1], addr.strip() or '/')))
else:
res.append((r['id'], addr.strip() or '/'))