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

[IMP] name_get of res.partner.address 

bzr revid: rco@openerp.com-20110719144429-eceyu7akt2t9np1b
This commit is contained in:
Raphael Collet 2011-07-19 16:44:29 +02:00
parent 74448ac422 30784d14ab
commit a98c391fdd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openerp/addons/base/res/partner/partner.py
View File

@ -312,14 +312,13 @@ class res_partner_address(osv.osv):
if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
res.append((r['id'], r['partner_id'][1]))
else:
addr = r['name'] or ''
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 '')
# make a comma-separated list with the following non-empty elements
elems = [r['name'], r['country_id'] and r['country_id'][1], r['city'], r['street']]
addr = ', '.join(filter(bool, elems))
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 '/')))
res.append((r['id'], "%s: %s" % (r['partner_id'][1], addr or '/')))
else:
res.append((r['id'], addr.strip() or '/'))
res.append((r['id'], addr or '/'))
return res
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):