From 7c16706c7b0c6530d1e7ecdc9eac5a68012c56e5 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 19 Jul 2011 15:04:44 +0530 Subject: [PATCH 1/2] [IMP]:improved name_get in res_partner_address bzr revid: han@tinyerp.com-20110719093444-n918l10kuk9ifctx --- openerp/addons/base/res/partner/partner.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index d3a75da1e7a..2072a6e43e9 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -309,6 +309,7 @@ class res_partner_address(osv.osv): } def name_get(self, cr, user, ids, context={}): + print 'name get is called' if not len(ids): return [] res = [] @@ -316,10 +317,10 @@ 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 '' + 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 '') + addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' ' + (r['street'] or '') 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: From 30784d14ab9f0256bb0dc21248221d79b3cacf2a Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 19 Jul 2011 16:27:36 +0530 Subject: [PATCH 2/2] [IMP]:removed comment from res_partner_address bzr revid: han@tinyerp.com-20110719105736-3icdgm513i3rll2i --- openerp/addons/base/res/partner/partner.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index 2072a6e43e9..89d373cdae3 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -309,7 +309,6 @@ class res_partner_address(osv.osv): } def name_get(self, cr, user, ids, context={}): - print 'name get is called' if not len(ids): return [] res = [] @@ -320,7 +319,7 @@ class res_partner_address(osv.osv): 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 '') + addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' ' + (r['street'] or '') 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: