From a6a10c92459c252e15b71cd6a63a22ee052987f3 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 8 Sep 2010 17:54:00 +0530 Subject: [PATCH] [ADD] partner: Modfiy the name of res_partner_address for adding the support partner_address bzr revid: sbh@tinyerp.com-20100908122400-wuwvhxv0ux3irxzp --- bin/addons/base/res/partner/partner.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index 11a3032dafc..f5772274dd9 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -305,7 +305,10 @@ 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 '') - res.append((r['id'], addr.strip() or '/')) + if context.get('contact_display', 'contact')=='partner_address': + res.append((r['id'], r['partner_id'][1] +','+ addr.strip() or '/')) + else: + res.append((r['id'], addr.strip() or '/')) return res def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): @@ -313,7 +316,7 @@ class res_partner_address(osv.osv): args=[] if not context: context={} - if context.get('contact_display', 'contact')=='partner': + if context.get('contact_display', 'contact')=='partner ' or context.get('contact_display', 'contact')=='partner_address ' : ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context) else: if not name: