[MERGE] forward port branch saas-15 up to 180f105508c

1 files changed, 7 insertions, 1 deletions

diff --git a/addons/base_geolocalize/models/res_partner.py b/addons/base_geolocalize/models/res_partner.py
index 3594e1cb61b..01e2c36baeb 100644
--- a/addons/base_geolocalize/models/res_partner.py
+++ b/addons/base_geolocalize/models/res_partner.py
@@ -30,7 +30,13 @@ def geo_find(addr, apikey=False):
     if result['status'] != 'OK':
         if result.get('error_message'):
             _logger.error(result['error_message'])
-        return None
+            error_msg = _('Unable to geolocate, received the error:\n%s'
+                          '\n\nGoogle made this a paid feature.\n'
+                          'You should first enable billing on your Google account.\n'
+                          'Then, go to Developer Console, and enable the APIs:\n'
+                          'Geocoding, Maps Static, Maps Javascript.\n'
+                          % result['error_message'])
+            raise UserError(error_msg)
 
     try:
         geo = result['results'][0]['geometry']['location']