[MIG] l10n_es_delivery_dhl_parcel: Migration to 19.0

Author: sergioM-S73

delivery_dhl_parcel/README.rst

@@ -21,13 +21,13 @@ Delivery DHL Parcel
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github
-    :target: https://github.com/OCA/l10n-spain/tree/18.0/delivery_dhl_parcel
+    :target: https://github.com/OCA/l10n-spain/tree/19.0/delivery_dhl_parcel
     :alt: OCA/l10n-spain
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-delivery_dhl_parcel
+    :target: https://translation.odoo-community.org/projects/l10n-spain-19-0/l10n-spain-19-0-delivery_dhl_parcel
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -149,18 +149,19 @@ Contrareembolso
 Known issues / Roadmap
 ======================
 
-- La API no facilita métodos para cotizar el coste real de los envíos,
-  por lo que siempre se cotizan a 0. Si la cotización de envíos es
-  necesaria, puede instalarse el módulo OCA delivery_price_method o bien
-  personalizar el método de cotización para este tipo de transportista.
+-  La API no facilita métodos para cotizar el coste real de los envíos,
+   por lo que siempre se cotizan a 0. Si la cotización de envíos es
+   necesaria, puede instalarse el módulo OCA delivery_price_method o
+   bien personalizar el método de cotización para este tipo de
+   transportista.
 
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-spain/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/l10n-spain/issues/new?body=module:%20delivery_dhl_parcel%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/l10n-spain/issues/new?body=module:%20delivery_dhl_parcel%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -175,13 +176,13 @@ Authors
 Contributors
 ------------
 
-- `Studio73 <https://www.studio73.es>`__:
+-  `Studio73 <https://www.studio73.es>`__:
 
-  - Ethan Hildick
+   -  Ethan Hildick
 
-- `Tecnativa <https://www.tecnativa.com>`__:
+-  `Tecnativa <https://www.tecnativa.com>`__:
 
-  - Víctor Martínez
+   -  Víctor Martínez
 
 Maintainers
 -----------
@@ -204,6 +205,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-hildickethan| 
 
-This module is part of the `OCA/l10n-spain <https://github.com/OCA/l10n-spain/tree/18.0/delivery_dhl_parcel>`_ project on GitHub.
+This module is part of the `OCA/l10n-spain <https://github.com/OCA/l10n-spain/tree/19.0/delivery_dhl_parcel>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

delivery_dhl_parcel/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Delivery DHL Parcel",
     "summary": "Delivery Carrier implementation for DHL Parcel using their API",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "category": "Stock",
     "website": "https://github.com/OCA/l10n-spain",
     "author": "Studio73, Odoo Community Association (OCA)",

delivery_dhl_parcel/models/delivery_carrier.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import base64
 
-from odoo import _, fields, models
+from odoo import fields, models
 from odoo.tools import float_compare
 
 from .dhl_parcel_request import (
@@ -69,7 +69,7 @@ def dhl_parcel_get_tracking_link(self, picking):
 
     def _prepare_dhl_parcel_address_info(self, partner):
         phone = partner.phone and partner.phone.replace(" ", "") or ""
-        mobile = partner.mobile and partner.mobile.replace(" ", "") or ""
+
         address = partner.street or ""
         if partner.street2:
             address += " " + partner.street2
@@ -91,7 +91,7 @@ def _prepare_dhl_parcel_address_info(self, partner):
             "City": partner.city or "",
             "PostalCode": partner.zip or "",
             "Country": partner.country_id.code or "",
-            "Phone": phone or mobile,
+            "Phone": phone,
             "Email": partner.email or "",
         }
 
@@ -182,15 +182,14 @@ def dhl_parcel_send_shipping(self, pickings):
                 continue
             vals["tracking_number"] = response.get("Tracking", "")
             # We post an extra message in the chatter with the rest of the response
-            body = _(
+            body = self.env._(
                 "DHL Parcel Shipping extra info:\n"
-                "Origin: %(origin)s, Customer: %(customer)s, AWB: %(awb)s, LP: %(lp)s"
-            ) % {
-                "origin": response.get("Origin", "N/A"),
-                "customer": response.get("Customer", "N/A"),
-                "awb": response.get("AWB", "N/A"),
-                "lp": response.get("LP", "N/A"),
-            }
+                "Origin: %(origin)s, Customer: %(customer)s, AWB: %(awb)s, LP: %(lp)s",
+                origin=response.get("Origin", "N/A"),
+                customer=response.get("Customer", "N/A"),
+                awb=response.get("AWB", "N/A"),
+                lp=response.get("LP", "N/A"),
+            )
             attachment = []
             if response.get("Label"):
                 label_format = picking.carrier_id.dhl_parcel_label_format.lower()
@@ -243,15 +242,18 @@ def dhl_parcel_cancel_shipment(self, pickings):
         for picking in pickings.filtered("carrier_tracking_ref"):
             response = dhl_parcel_request.cancel_shipment(picking.carrier_tracking_ref)
             if not response.status_code == 200:
-                msg = _(
-                    "DHL Parcel Cancellation failed with reason: %s"
-                ) % response.get("Message", "Connection Error")
+                msg = self.env._(
+                    "DHL Parcel Cancellation failed with reason: %(reason)s",
+                    reason=response.get("Message", "Connection Error"),
+                )
                 picking.message_post(body=msg)
                 continue
             picking.carrier_tracking_ref = False
             picking.message_post(
-                body=_("DHL Parcel Expedition with reference %s cancelled")
-                % picking.carrier_tracking_ref
+                body=self.env._(
+                    "DHL Parcel Expedition with reference %(reference)s cancelled",
+                    reference=picking.carrier_tracking_ref,
+                )
             )
 
     def dhl_parcel_get_label(self, carrier_tracking_ref):
@@ -293,12 +295,12 @@ def dhl_parcel_rate_shipment(self, order):
         return {
             "success": True,
             "price": self.product_id.lst_price,
-            "error_message": _(
+            "error_message": self.env._(
                 """DHL Parcel API doesn't provide methods to compute delivery rates, so
                 you should rely on another price method instead or override this
                 one in your custom code."""
             ),
-            "warning_message": _(
+            "warning_message": self.env._(
                 """DHL Parcel API doesn't provide methods to compute delivery rates, so
                 you should rely on another price method instead or override this
                 one in your custom code."""
@@ -313,7 +315,7 @@ def action_open_end_day(self):
         )
         view_id = self.env.ref("delivery_dhl_parcel.delivery_endday_wizard_form").id
         return {
-            "name": _("DHL Parcel End Day"),
+            "name": self.env._("DHL Parcel End Day"),
             "type": "ir.actions.act_window",
             "view_mode": "form",
             "res_model": "dhl.parcel.endday.wizard",

delivery_dhl_parcel/models/dhl_parcel_request.py

@@ -3,7 +3,7 @@
 
 import requests
 
-from odoo import _, fields
+from odoo import fields
 from odoo.exceptions import UserError
 
 DHL_PARCEL_DELIVERY_STATES_STATIC = {
@@ -27,6 +27,7 @@ class DhlParcelRequest:
 
     def __init__(self, carrier):
         self.carrier_id = carrier
+        self.env = carrier.env
         self.token = self._get_new_auth_token(
             username=carrier.dhl_parcel_uid or "",
             password=carrier.dhl_parcel_password or "",
@@ -47,7 +48,9 @@ def _send_api_request(self, request_type, url, data=None, skip_auth=False):
                 res = requests.post(url=url, json=data, headers=auth, timeout=60)
             else:
                 raise UserError(
-                    _("Unsupported request type, please only use 'GET' or 'POST'")
+                    self.env._(
+                        "Unsupported request type, please only use 'GET' or 'POST'"
+                    )
                 )
             res.raise_for_status()
             dhl_parcel_last_request = (
@@ -56,14 +59,19 @@ def _send_api_request(self, request_type, url, data=None, skip_auth=False):
             self.carrier_id.log_xml(dhl_parcel_last_request, "dhl_parcel_last_request")
             self.carrier_id.log_xml(res.text or "", "dhl_parcel_last_response")
         except requests.exceptions.Timeout:
-            raise UserError(_("Timeout: the server did not reply within 60s")) from None
+            raise UserError(
+                self.env._("Timeout: the server did not reply within 60s")
+            ) from None
         except (ValueError, requests.exceptions.ConnectionError):
-            raise UserError(_("Server not reachable, please try again later")) from None
+            raise UserError(
+                self.env._("Server not reachable, please try again later")
+            ) from None
         except requests.exceptions.HTTPError as e:
-            error_message = _("%(error)s\n%(message)s") % {
-                "error": str(e),
-                "message": res.json().get("Message", "") if res.text else "",
-            }
+            error_message = self.env._(
+                "%(error)s\n%(message)s",
+                error=str(e),
+                message=res.json().get("Message", "") if res and res.text else "",
+            )
             raise UserError(error_message) from None
         return res
 

delivery_dhl_parcel/models/stock_picking.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import base64
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class StockPicking(models.Model):
@@ -23,7 +23,9 @@ def dhl_parcel_get_label(self):
             "pdf" if label_format == "pdf" else "txt",
         )
         self.message_post(
-            body=(_("DHL Parcel label for %s") % tracking_ref),
+            body=self.env._(
+                "DHL Parcel label for %(reference)s", reference=tracking_ref
+            ),
             attachments=[(label_name, label)],
         )
         # We return label in case it wants to be printed in an inheritance
@@ -41,10 +43,14 @@ def dhl_parcel_toggle_hold_shipment(self):
             self.dhl_parcel_shipment_held = not carrier.dhl_parcel_release_shipment(
                 tracking_ref
             )
-            message = _("Released shipment for {}").format(tracking_ref)
+            message = self.env._(
+                "Released shipment for %(reference)s", reference=tracking_ref
+            )
         else:
             self.dhl_parcel_shipment_held = carrier.dhl_parcel_hold_shipment(
                 tracking_ref
             )
-            message = _("Held shipment for {}").format(tracking_ref)
+            message = self.env._(
+                "Held shipment for %(reference)s", reference=tracking_ref
+            )
         self.message_post(body=message)

delivery_dhl_parcel/static/description/index.html

@@ -374,7 +374,7 @@ <h1>Delivery DHL Parcel</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:df729672478265589dddafc3ad63dbfb5cd9673dd865a9dcbad9c8102ccfc558
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-spain/tree/18.0/delivery_dhl_parcel"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-delivery_dhl_parcel"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-spain/tree/19.0/delivery_dhl_parcel"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-19-0/l10n-spain-19-0-delivery_dhl_parcel"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Este módulo integra la API de DHL Parcel con Odoo. No es válido para
 otras integraciones de DHL como el Express, que usan otras APIs.</p>
 <p>IMPORTANTE: Hay varias APIs distintas para DHL España y DHL Parcel, esta
@@ -527,16 +527,17 @@ <h2><a class="toc-backref" href="#toc-entry-11">Known issues / Roadmap</a></h2>
 <ul class="simple">
 <li>La API no facilita métodos para cotizar el coste real de los envíos,
 por lo que siempre se cotizan a 0. Si la cotización de envíos es
-necesaria, puede instalarse el módulo OCA delivery_price_method o bien
-personalizar el método de cotización para este tipo de transportista.</li>
+necesaria, puede instalarse el módulo OCA delivery_price_method o
+bien personalizar el método de cotización para este tipo de
+transportista.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
 <h2><a class="toc-backref" href="#toc-entry-12">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-spain/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/l10n-spain/issues/new?body=module:%20delivery_dhl_parcel%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/l10n-spain/issues/new?body=module:%20delivery_dhl_parcel%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -571,7 +572,7 @@ <h3><a class="toc-backref" href="#toc-entry-16">Maintainers</a></h3>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/hildickethan"><img alt="hildickethan" src="https://github.com/hildickethan.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-spain/tree/18.0/delivery_dhl_parcel">OCA/l10n-spain</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-spain/tree/19.0/delivery_dhl_parcel">OCA/l10n-spain</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

delivery_dhl_parcel/tests/test_delivery_dhl_parcel.py

@@ -4,8 +4,9 @@
 from unittest import mock
 from unittest.mock import MagicMock, Mock
 
-from odoo.tests import Form, common
+from odoo.tests import Form
 
+from odoo.addons.base.tests.common import BaseCommon
 from odoo.addons.delivery_dhl_parcel.models.dhl_parcel_request import DhlParcelRequest
 
 request_model = (
@@ -15,7 +16,7 @@
 # There is also no public test user so we mock all API requests
 
 
-class TestDeliveryDhlParcel(common.SingleTransactionCase):
+class TestDeliveryDhlParcel(BaseCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -258,6 +259,7 @@ def test_release_shipment_success(self, mock_requests):
         ],
     )
     def test_02_dhl_parcel_picking_update(self, redirect_mock, *args):
+        self.picking.carrier_tracking_ref = "0870002260"
         self.picking.tracking_state_update()
         self.assertEqual(
             self.picking.tracking_state_history,
@@ -285,6 +287,7 @@ def test_02_dhl_parcel_picking_update(self, redirect_mock, *args):
     @mock.patch(f"{request_model}.hold_shipment", return_value=True)
     @mock.patch(f"{request_model}.release_shipment", return_value=True)
     def test_03_dhl_parcel_picking_toggle_hold(self, redirect_mock, *args):
+        self.picking.carrier_tracking_ref = "0870002260"
         self.assertFalse(self.picking.dhl_parcel_shipment_held)
         self.picking.dhl_parcel_toggle_hold_shipment()  # hold
         self.assertTrue(self.picking.dhl_parcel_shipment_held)
@@ -322,6 +325,7 @@ def test_05_dhl_parcel_get_tracking_link(self):
         f"{request_model}.print_shipment", return_value="JVBERiasdasdsdcfnsdhfbasdf=="
     )
     def test_06_dhl_parcel_get_label(self, redirect_mock, *args):
+        self.picking.carrier_tracking_ref = "0870002260"
         label = self.picking.dhl_parcel_get_label()
         self.assertTrue(label)