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

[FIX] crm_partner_assign: google map is confused by certain country names 

bzr revid: odo@openerp.com-20120309015804-1se24wx6fx9g0a3o
This commit is contained in:
Olivier Dony 2012-03-09 02:58:04 +01:00
parent dd16fb2819
commit 84e927120c
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
addons/crm_partner_assign/partner_geo_assign.py
View File

@ -42,7 +42,16 @@ def geo_find(addr):
if not result:
return None
return float(result.group(2)),float(result.group(1))
def geo_query_address(street=None, zip=None, city=None, state=None, country=None):
if country and ',' in country and (country.endswith(' of') or country.endswith(' of the')):
# put country qualifier in front, otherwise GMap gives wrong results,
# e.g. 'Congo, Democratic Republic of the' => 'Democratic Republic of the Congo'
country = '{1} {0}'.format(*country.split(',',1))
return tools.ustr(', '.join(filter(None, [street,
("%s %s" % (zip or '', city or '')).strip(),
state,
country])))
class res_partner_grade(osv.osv):
_order = 'sequence'
@ -88,16 +97,16 @@ class res_partner(osv.osv):
'partner_weight': lambda *args: 0
}
def geo_localize(self, cr, uid, ids, context=None):
for partner in self.browse(cr, uid, ids, context=context):
# Don't pass context to browse()! We need country names in english below
for partner in self.browse(cr, uid, ids):
if not partner.address:
continue
contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact?
addr = ', '.join(filter(None, [
contact.street,
("%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))
result = geo_find(geo_query_address(street=contact.street,
zip=contact.zip,
city=contact.city,
state=contact.state_id.name,
country=contact.country_id.name))
if result:
self.write(cr, uid, [partner.id], {
'partner_latitude': result[0],
@ -154,18 +163,16 @@ class crm_lead(osv.osv):
self.write(cr, uid, [lead.id], {'date_assign': fields.date.context_today(self,cr,uid,context=context), 'partner_assigned_id': partner_id}, context=context)
return res
def assign_geo_localize(self, cr, uid, ids, latitude=False, longitude=False, context=None):
for lead in self.browse(cr, uid, ids, context=context):
# Don't pass context to browse()! We need country name in english below
for lead in self.browse(cr, uid, ids):
if not lead.country_id:
continue
addr = ', '.join(filter(None, [
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 ''
]))
result = geo_find(tools.ustr(addr))
result = geo_find(geo_query_address(street=lead.street,
zip=lead.zip,
city=lead.city,
state=lead.state_id.name,
country=lead.country_id.name))
if not latitude and result:
latitude = result[0]
if not longitude and result:
@ -175,7 +182,7 @@ class crm_lead(osv.osv):
'partner_longitude': longitude
}, context=context)
return True
def search_geo_partner(self, cr, uid, ids, context=None):
res_partner = self.pool.get('res.partner')
res_partner_ids = {}