odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] crm_partner_assign: partial revert of recent commit, care for missing city/zip 

bzr revid: odo@openerp.com-20120309011056-tj3iwk2j9r3anp3z
This commit is contained in:
Olivier Dony 2012-03-09 02:10:56 +01:00
parent a68bbb65f4
commit 230708ac01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/crm_partner_assign/partner_geo_assign.py
View File

@ -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 ''
]))