Merge branch 'fix/11.0-test/uszipcode_modules' into '11.0-test'

Fix/11.0 `l10n_us_partner_zipcode`

See merge request hibou-io/hibou-odoo/suite!2

.gitlab-ci.yml

@@ -14,7 +14,8 @@ variables:
   ENTERPRISE_PROJECT_ID: 10004796
 
 before_script:
-  - RELEASE=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g")
+  - RELEASE=$(echo $CI_COMMIT_REF_NAME | sed "s{.*\/\(.*\)\/.*{\1{g")
+  - IMAGE_TAG=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g")
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
   - apk add git
   - git submodule sync --recursive
@@ -24,11 +25,13 @@ build:
   stage: build
   script:
     - sed -i "s/RELEASE/$RELEASE/g" Dockerfile-GitLab
-    - docker build --pull -t $CONTAINER_IMAGE:$RELEASE -f Dockerfile-GitLab .
-    - docker push $CONTAINER_IMAGE:$RELEASE
+    - docker build --pull -t $CONTAINER_IMAGE:$IMAGE_TAG -f Dockerfile-GitLab .
+    - docker push $CONTAINER_IMAGE:$IMAGE_TAG
 
 trigger:
   stage: trigger
   script:
     - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=$RELEASE $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline
+  only:
+    - /^\d\d\.\d/
 

l10n_us_partner_zipcode/res_partner.py

@@ -3,10 +3,10 @@ import logging
 _logger = logging.getLogger(__name__)
 
 try:
-    from uszipcode import ZipcodeSearchEngine
+    from uszipcode import SearchEngine
 except ImportError:
     _logger.warn('module "uszipcode" cannot be loaded, you will be unable to detect Cities and States by ZIP')
-    ZipcodeSearchEngine = None
+    SearchEngine = None
 
 from odoo import api, fields, models
 
@@ -16,24 +16,24 @@ class Partner(models.Model):
 
     @api.onchange('zip')
     def _zip_to_city_state(self):
-        if ZipcodeSearchEngine and self.zip and not self.city:
+        if SearchEngine and self.zip and not self.city:
             country_us = self.env['res.country'].search([('code', '=', 'US')], limit=1)
             state_obj = self.env['res.country.state']
             if not self.country_id or self.country_id.id == country_us.id:
-                with ZipcodeSearchEngine() as search:
+                with SearchEngine() as search:
                     zipcode = search.by_zipcode(self.zip)
                     if zipcode:
                         if not self.country_id:
                             self.country_id = country_us
 
-                        self.city = zipcode['City']
+                        self.city = zipcode.city
                         self.state_id = state_obj.search([
-                            ('code', '=', zipcode['State']),
+                            ('code', '=', zipcode.state),
                             ('country_id', '=', country_us.id),
                         ], limit=1)
 
                         if hasattr(self, 'partner_latitude') and not self.partner_latitude:
-                            self.partner_latitude = zipcode['Latitude']
-                            self.partner_longitude = zipcode['Longitude']
+                            self.partner_latitude = zipcode.lat
+                            self.partner_longitude = zipcode.lng
                             self.date_localization = fields.Date.context_today(self)
         return {}

sale_planner/models/partner.py

@@ -1,9 +1,9 @@
 from odoo import api, fields, models
 
 try:
-    from uszipcode import ZipcodeSearchEngine
+    from uszipcode import SearchEngine
 except ImportError:
-    ZipcodeSearchEngine = None
+    SearchEngine = None
 
 
 class Partner(models.Model):
@@ -13,13 +13,13 @@ class Partner(models.Model):
     def geo_localize(self):
         # We need country names in English below
         for partner in self.with_context(lang='en_US'):
-            if ZipcodeSearchEngine and partner.zip:
-                with ZipcodeSearchEngine() as search:
+            if SearchEngine and partner.zip:
+                with SearchEngine() as search:
                     zipcode = search.by_zipcode(str(self.zip).split('-')[0])
-                    if zipcode and zipcode['Latitude']:
+                    if zipcode and zipcode.lat:
                         partner.write({
-                            'partner_latitude': zipcode['Latitude'],
-                            'partner_longitude': zipcode['Longitude'],
+                            'partner_latitude': zipcode.lat,
+                            'partner_longitude': zipcode.lng,
                             'date_localization': fields.Date.context_today(partner),
                         })
                     else:

sale_planner/wizard/order_planner.py

@@ -8,10 +8,10 @@ from logging import getLogger
 _logger = getLogger(__name__)
 
 try:
-    from uszipcode import ZipcodeSearchEngine
+    from uszipcode import SearchEngine
 except ImportError:
     _logger.warn('module "uszipcode" cannot be loaded, falling back to Google API')
-    ZipcodeSearchEngine = None
+    SearchEngine = None
 
 from odoo import api, fields, models, tools
 from odoo.addons.base_geolocalize.models.res_partner import geo_find, geo_query_address
@@ -58,12 +58,12 @@ class FakePartner():
         if not hasattr(self, 'date_localization') and self.date_localization:
             self.date_localization = 'TODAY!'
             # The fast way.
-            if ZipcodeSearchEngine and self.zip:
-                with ZipcodeSearchEngine() as search:
+            if SearchEngine and self.zip:
+                with SearchEngine() as search:
                     zipcode = search.by_zipcode(str(self.zip).split('-')[0])
-                    if zipcode and zipcode['Latitude']:
-                        self.partner_latitude = zipcode['Latitude']
-                        self.partner_longitude = zipcode['Longitude']
+                    if zipcode and zipcode.lat:
+                        self.partner_latitude = zipcode.lat
+                        self.partner_longitude = zipcode.lng
                         return self.date_localization
 
             # The slow way.