pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]: base: Improvement in name get of partner address to display address details in the order: Name, zip city country street

Browse Source 
bzr revid: rpa@tinyerp.com-20100715120234-azoxxxii4pcpk8cr
This commit is contained in:
rpa (Open ERP)
2010-07-15 17:32:34 +05:30
parent 691cfcf2ec
commit 9b5f933b13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/res/partner/partner.py
+3 -3
View File
@@ -297,14 +297,14 @@ class res_partner_address(osv.osv):
if not len(ids):
return []
res = []
for r in self.read(cr, user, ids, ['name','zip','city','partner_id', 'street']):
for r in self.read(cr, user, ids, ['name','zip','country_id', 'city','partner_id', 'street']):
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['zip'] or r['city']):
if r['name'] and (r['zip'] or r['country_id']):
addr += ', '
addr += (r['street'] or '') + ' ' + (r['zip'] or '') + ' ' + (r['city'] or '')
addr += (r['zip'] or '') + ' ' + (r['city'] or '') + ' ' + (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['street'] or '')
res.append((r['id'], addr.strip() or '/'))
return res