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'
'partner_weight': lambda *args: 0
}
def geo_localize(self, cr, uid, ids, context=None):
- # Don't pass context to browse()! We need country names in english below
- for partner in self.browse(cr, uid, ids):
+ for partner in self.browse(cr, uid, ids, context=context):
if not partner.address:
continue
contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact?
- 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))
+ addr = ', '.join(filter(None, [
+ contact.street,
+ "%s %s" % (contact.zip , contact.city),
+ contact.state_id and contact.state_id.name,
+ contact.country_id and contact.country_id.name]))
+ result = geo_find(tools.ustr(addr))
if result:
self.write(cr, uid, [partner.id], {
'partner_latitude': result[0],
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):
- # Don't pass context to browse()! We need country name in english below
- for lead in self.browse(cr, uid, ids):
+ for lead in self.browse(cr, uid, ids, context=context):
if not lead.country_id:
continue
- 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))
+ addr = ', '.join(filter(None, [
+ lead.street,
+ "%s %s" % (lead.zip, lead.city),
+ lead.state_id and lead.state_id.name or '',
+ lead.country_id and lead.country_id.name or ''
+ ]))
+ result = geo_find(tools.ustr(addr))
if not latitude and result:
latitude = result[0]
if not longitude and result:
'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 = {}
('partner_weight', '>', 0),
('partner_latitude', '>', latitude - 2), ('partner_latitude', '<', latitude + 2),
('partner_longitude', '>', longitude - 1.5), ('partner_longitude', '<', longitude + 1.5),
- ('country_id', '=', lead.country_id.id),
+ ('country', '=', lead.country_id.id),
], context=context)
# 2. second way: in the same country, big area
('partner_weight', '>', 0),
('partner_latitude', '>', latitude - 4), ('partner_latitude', '<', latitude + 4),
('partner_longitude', '>', longitude - 3), ('partner_longitude', '<' , longitude + 3),
- ('country_id', '=', lead.country_id.id),
- ], context=context)
-
- # 3. third way: in the same country, extra large area
- if not partner_ids:
- partner_ids = res_partner.search(cr, uid, [
- ('partner_weight','>', 0),
- ('partner_latitude','>', latitude - 8), ('partner_latitude','<', latitude + 8),
- ('partner_longitude','>', longitude - 8), ('partner_longitude','<', longitude + 8),
('country', '=', lead.country_id.id),
], context=context)
+
# 5. fifth way: anywhere in same country
if not partner_ids:
# still haven't found any, let's take all partners in the country!
partner_ids = res_partner.search(cr, uid, [
('partner_weight', '>', 0),
- ('country_id', '=', lead.country_id.id),
+ ('country', '=', lead.country_id.id),
], context=context)
# 6. sixth way: closest partner whatsoever, just to have at least one result