From 230708ac01f4a10c3629f2c5e3416b83efbdc2fa Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 9 Mar 2012 02:10:56 +0100 Subject: [PATCH] [FIX] crm_partner_assign: partial revert of recent commit, care for missing city/zip bzr revid: odo@openerp.com-20120309011056-tj3iwk2j9r3anp3z --- addons/crm_partner_assign/partner_geo_assign.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index f522cc63d7a..15439ef8120 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -94,7 +94,7 @@ class res_partner(osv.osv): contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact? addr = ', '.join(filter(None, [ contact.street, - "%s %s" % (contact.zip , contact.city), + ("%s %s" % (contact.zip or '', contact.city or '')).strip(), contact.state_id and contact.state_id.name, contact.country_id and contact.country_id.name])) result = geo_find(tools.ustr(addr)) @@ -160,8 +160,8 @@ class crm_lead(osv.osv): if not lead.country_id: continue addr = ', '.join(filter(None, [ - lead.street, - "%s %s" % (lead.zip, lead.city), + lead.street, + ("%s %s" % (lead.zip or '', lead.city or '')).strip(), lead.state_id and lead.state_id.name or '', lead.country_id and lead.country_id.name or '' ]))