From 3aadb0ad29bd03356457431a9710f0679a92e950 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 19 Jul 2010 18:59:48 +0530 Subject: [PATCH] [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 --- bin/addons/base/res/partner/partner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index 93095b3edd6..11a3032dafc 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -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