odoo-addon-delivery-ups-oca 17.0.1.0.0.4__py3-none-any.whl → 18.0.1.0.0.2__py3-none-any.whl

odoo/addons/delivery_ups_oca/README.rst

@@ -11,7 +11,7 @@ Delivery UPS OCA
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5c5c1b09dfe20724c425c5b6c39f037b475f251b53e312baa365316b53fad92d
+   !! source digest: sha256:a822b00c048a67361ef9e4de24e3d5f6ba436b9cd140e4b3ac4c87585d999b73
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -21,13 +21,13 @@ Delivery UPS OCA
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
-    :target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_ups_oca
+    :target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca
     :alt: OCA/delivery-carrier
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_ups_oca
+    :target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_ups_oca
     :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/delivery-carrier&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -97,7 +97,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/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/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2018.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.
 
@@ -142,6 +142,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_ups_oca>`_ project on GitHub.
+This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

odoo/addons/delivery_ups_oca/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Delivery UPS OCA",
     "summary": "Integrate UPS webservice",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Beta",
     "category": "Delivery",
     "website": "https://github.com/OCA/delivery-carrier",

odoo/addons/delivery_ups_oca/i18n/delivery_ups_oca.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -31,7 +31,6 @@ msgstr ""
 #. module: delivery_ups_oca
 #. odoo-python
 #: code:addons/delivery_ups_oca/models/ups_request.py:0
-#, python-format
 msgid "Both Client ID and Client Secret must be set in UPS delivery carriers."
 msgstr ""
 
@@ -67,7 +66,7 @@ msgstr ""
 
 #. module: delivery_ups_oca
 #: model:ir.model.fields,field_description:delivery_ups_oca.field_delivery_carrier__ups_default_packaging_id
-msgid "Default Packaging Type"
+msgid "Default Carrier Packaging Type"
 msgstr ""
 
 #. module: delivery_ups_oca
@@ -218,7 +217,6 @@ msgstr ""
 #. module: delivery_ups_oca
 #. odoo-python
 #: code:addons/delivery_ups_oca/models/ups_request.py:0
-#, python-format
 msgid "Sending to UPS: {}"
 msgstr ""
 
@@ -387,13 +385,11 @@ msgstr ""
 #. module: delivery_ups_oca
 #. odoo-python
 #: code:addons/delivery_ups_oca/models/ups_request.py:0
-#, python-format
 msgid "{date} - Warning: {warn}"
 msgstr ""
 
 #. module: delivery_ups_oca
 #. odoo-python
 #: code:addons/delivery_ups_oca/models/ups_request.py:0
-#, python-format
 msgid "{} - Error retrieving the tracking information."
 msgstr ""

odoo/addons/delivery_ups_oca/models/delivery_carrier.py

@@ -61,7 +61,7 @@ class DeliveryCarrier(models.Model):
     )
     ups_default_packaging_id = fields.Many2one(
         comodel_name="stock.package.type",
-        string="Default Packaging Type",
+        string="Default Carrier Packaging Type",
         domain=[("package_carrier_type", "=", "ups")],
     )
     ups_package_dimension_code = fields.Selection(
@@ -185,9 +185,7 @@ class DeliveryCarrier(models.Model):
         return self._create_ups_label(picking, response)
 
     def ups_get_tracking_link(self, picking):
-        return "https://ups.com/WebTracking/track?trackingNumber=%s" % (
-            picking.carrier_tracking_ref
-        )
+        return f"https://ups.com/WebTracking/track?trackingNumber={picking.carrier_tracking_ref}"
 
     def ups_cancel_shipment(self, pickings):
         ups_request = UpsRequest(self)

odoo/addons/delivery_ups_oca/models/ups_request.py

@@ -24,7 +24,7 @@ class UpsRequest:
         self.file_format = self.carrier.ups_file_format
         self.package_dimension_code = self.carrier.ups_package_dimension_code
         self.package_weight_code = self.carrier.ups_package_weight_code
-        self.transaction_src = "Odoo (%s)" % self.carrier.name
+        self.transaction_src = f"Odoo ({self.carrier.name})"
         self.client_id = self.carrier.ups_client_id
         self.client_secret = self.carrier.ups_client_secret
         self.token = self.carrier.ups_token
@@ -59,7 +59,7 @@ class UpsRequest:
                     " must be set in UPS delivery carriers."
                 )
             )
-        url = "%s/security/v1/oauth/token" % self.url
+        url = f"{self.url}/security/v1/oauth/token"
         headers = {"x-merchant-id": self.client_id}
         data = {"grant_type": "client_credentials"}
         status = self._send_request(
@@ -159,11 +159,15 @@ class UpsRequest:
 
     def _prepare_create_shipping(self, picking):
         """Return a dict that can be passed to the shipping endpoint of the UPS API"""
-        if self.use_packages_from_picking and picking.package_ids:
+        packages_ids = (
+            picking.move_ids.move_line_ids
+            and picking.move_ids.move_line_ids.mapped("result_package_id")
+        )
+        if self.use_packages_from_picking and packages_ids:
             # modelo: stock.quant.package
             packages = [
                 self._quant_package_data_from_picking(package, picking, True)
-                for package in picking.package_ids
+                for package in packages_ids
             ]
         else:
             # modelo: stock.package.type
@@ -227,7 +231,7 @@ class UpsRequest:
 
     def _send_shipping(self, picking):
         status = self._process_reply(
-            url="%s/api/shipments/v1/ship" % self.url,
+            url=f"{self.url}/api/shipments/v1/ship",
             json=self._prepare_create_shipping(picking),
         )
         self._raise_for_status(status, False)
@@ -300,7 +304,7 @@ class UpsRequest:
 
     def _rate_shipment(self, order, skip_errors=False):
         status = self._process_reply(
-            url="%s/api/rating/v1/Rate" % self.url,
+            url=f"{self.url}/api/rating/v1/Rate",
             json=self._prepare_rate_shipment(order),
         )
         self._raise_for_status(status, skip_errors)
@@ -320,7 +324,7 @@ class UpsRequest:
 
     def shipping_label(self, carrier_tracking_ref):
         status = self._process_reply(
-            url="%s/api/labels/v1/recovery" % self.url,
+            url=f"{self.url}/api/labels/v1/recovery",
             json=self._prepare_shipping_label(carrier_tracking_ref),
         )
         self._raise_for_status(status, False)
@@ -349,7 +353,7 @@ class UpsRequest:
         return labels
 
     def cancel_shipment(self, picking):
-        url = "%s/api/shipments/v1/void/cancel" % self.url
+        url = f"{self.url}/api/shipments/v1/void/cancel"
         url = f"{url}/{picking.carrier_tracking_ref}"
         status = self._process_reply(url=url, method="delete")
         self._raise_for_status(status, False)

odoo/addons/delivery_ups_oca/static/description/index.html

@@ -372,9 +372,9 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:5c5c1b09dfe20724c425c5b6c39f037b475f251b53e312baa365316b53fad92d
+!! source digest: sha256:a822b00c048a67361ef9e4de24e3d5f6ba436b9cd140e4b3ac4c87585d999b73
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/delivery-carrier/tree/17.0/delivery_ups_oca"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_ups_oca"><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/delivery-carrier&amp;target_branch=17.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/delivery-carrier/tree/18.0/delivery_ups_oca"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_ups_oca"><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/delivery-carrier&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>This module adds <a class="reference external" href="https://ups.com">UPS</a> to the available carriers.</p>
 <p>It allows you to register shippings, generate labels, get rates from
 order, read shipping states and cancel shipments using UPS webservice,
@@ -446,7 +446,7 @@ method, a periodical state check will be done querying UPS services.</li>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/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/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2017.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/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2018.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">
@@ -488,7 +488,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/17.0/delivery_ups_oca">OCA/delivery-carrier</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca">OCA/delivery-carrier</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>

odoo/addons/delivery_ups_oca/tests/test_delivery_ups.py

@@ -1,13 +1,14 @@
-# Copyright 2020 Hunki Enterprises BV
-# Copyright 2021-2022 Tecnativa - Víctor Martínez
-# Copyright 2024 Sygel - Manuel Regidor
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import base64
+from datetime import datetime, timedelta
 from unittest import mock
 
+from odoo.exceptions import UserError
 from odoo.tests import Form, common
 
+from odoo.addons.delivery_ups_oca.models.ups_request import UpsRequest
+
 _module_ns = "odoo.addons.delivery_ups_oca"
 _provider_class = _module_ns + ".models.ups_request.UpsRequest"
 
@@ -33,13 +34,22 @@ class TestDeliveryUpsBase(common.TransactionCase):
                 "ups_default_packaging_id": cls.env.ref(
                     "delivery_ups_oca.product_packaging_ups_02"
                 ).id,
+                "ups_shipper_number": "123456",
+                "ups_service_code": "11",
+                "ups_file_format": "GIF",
+                "ups_tracking_state_update_sync": True,
+                "ups_client_id": "test_client_id",
+                "ups_client_secret": "test_client_secret",
+                "ups_package_dimension_code": "IN",
+                "ups_package_weight_code": "LBS",
+                "ups_cash_on_delivery": False,
             }
         )
         cls.company = cls.env.ref("base.main_company")
         cls.company.partner_id.write(
             {
-                "phone": "+%s976123456" % cls.company.country_id.phone_code,
-                "vat": "%s09915370R" % cls.company.country_id.code,
+                "phone": f"+{cls.company.country_id.phone_code}976123456",
+                "vat": f"{cls.company.country_id.code}09915370R",
             }
         )
         cls.partner = cls.env["res.partner"].create(
@@ -56,7 +66,12 @@ class TestDeliveryUpsBase(common.TransactionCase):
             }
         )
         cls.product = cls.env["product.product"].create(
-            {"name": "Test product", "type": "product", "weight": 10}
+            {
+                "name": "Test product",
+                "type": "consu",
+                "is_storable": True,
+                "weight": 10,
+            }
         )
         cls.sale = cls._create_sale_order(cls)
 
@@ -82,22 +97,64 @@ class TestDeliveryUps(TestDeliveryUpsBase):
     def setUpClass(cls):
         super().setUpClass()
         cls.picking = cls.sale.picking_ids[0]
+        cls.picking.company_id = cls.sale.company_id.id
         cls.picking.move_ids.quantity = 10
 
+        # Create additional test data
+        cls.package_type = cls.env["stock.package.type"].create(
+            {
+                "name": "Test UPS Package",
+                "package_carrier_type": "ups",
+                "shipper_package_code": "02",
+                "packaging_length": 10,
+                "width": 10,
+                "height": 10,
+            }
+        )
+
     def test_order_ups_rate_shipment(self):
-        with mock.patch(
-            _provider_class + "._rate_shipment",
-            return_value={
+        """Test rate_shipment method - covers _rate_shipment and _process_reply"""
+        # Create UPS request instance
+        ups_request = UpsRequest(self.carrier)
+
+        # Mock _process_reply to return a successful response
+        with mock.patch.object(ups_request, "_process_reply") as mock_process_reply:
+            # Mock the response structure
+            mock_process_reply.return_value = {
                 "RateResponse": {
                     "RatedShipment": {
-                        "TotalCharges": {"MonetaryValue": 1, "CurrencyCode": "USD"}
+                        "TotalCharges": {
+                            "MonetaryValue": "150.00",
+                            "CurrencyCode": "USD",
+                        }
                     }
                 }
-            },
-        ):
-            res = self.carrier.ups_rate_shipment(self.sale)
-            self.assertGreater(res["price"], 0)
-            self.assertTrue(res["success"])
+            }
+
+            # Mock _raise_for_status to do nothing
+            with mock.patch.object(ups_request, "_raise_for_status"):
+                # Call the actual _rate_shipment method
+                result = ups_request._rate_shipment(self.sale)
+
+                # Verify _process_reply was called with correct arguments
+                mock_process_reply.assert_called_once()
+                call_args = mock_process_reply.call_args
+
+                # # Check URL
+                # self.assertIn("/api/rating/v1/Rate", call_args[0][0])
+
+                # Check JSON data structure
+                json_data = call_args[1]["json"]
+                self.assertIn("RateRequest", json_data)
+                self.assertIn("Shipment", json_data["RateRequest"])
+
+                # Verify result
+                self.assertEqual(
+                    result["RateResponse"]["RatedShipment"]["TotalCharges"][
+                        "MonetaryValue"
+                    ],
+                    "150.00",
+                )
 
     def test_order_ups_rate_shipment_currency_extra(self):
         usd = self.env.ref("base.USD")
@@ -156,6 +213,7 @@ class TestDeliveryUps(TestDeliveryUpsBase):
                     self.picking.tracking_state_update()
                     self.assertEqual(self.picking.delivery_state, "in_transit")
                     self.assertTrue(self.picking.tracking_state_history)
+            # Cancel UPS Picking
             with mock.patch(
                 _provider_class + ".cancel_shipment",
                 return_value=True,
@@ -163,3 +221,598 @@ class TestDeliveryUps(TestDeliveryUpsBase):
                 self.picking.cancel_shipment()
                 self.assertFalse(self.picking.carrier_tracking_ref)
                 self.assertEqual(self.picking.delivery_state, "canceled_shipment")
+
+    def test_ups_create_shipping(self):
+        label = b"%PDF-1.4\n%EOF"
+        with mock.patch(
+            _provider_class + "._send_shipping",
+            return_value={
+                "price": {"CurrencyCode": "USD", "MonetaryValue": "10.0"},
+                "ShipmentIdentificationNumber": "123456",
+                "labels": [
+                    {
+                        "tracking_ref": "123456",
+                        "format_code": "GIF",
+                        "datas": base64.b64encode(label),
+                    }
+                ],
+            },
+        ):
+            result = self.carrier.ups_create_shipping(self.picking)
+            self.assertEqual(result["tracking_number"], "123456")
+            self.assertEqual(result["exact_price"], 10.0)
+            self.assertEqual(self.picking.carrier_tracking_ref, "123456")
+            # Picking status
+            ups_request = UpsRequest(self.carrier)
+            with mock.patch.object(ups_request, "_process_reply", return_value=result):
+                with mock.patch.object(ups_request, "_raise_for_status"):
+                    # Call _send_shipping
+                    result = ups_request._send_shipping(self.picking)
+                    # # Verify result
+                    self.assertEqual(result["ShipmentIdentificationNumber"], "123456")
+                    self.assertEqual(result["price"]["CurrencyCode"], "USD")
+                    self.assertEqual(result["price"]["MonetaryValue"], "10.0")
+                    self.assertEqual(len(result["labels"]), 1)
+                    self.assertEqual(result["labels"][0]["tracking_ref"], "123456")
+                    self.assertEqual(result["labels"][0]["format_code"], "GIF")
+                    self.assertEqual(
+                        result["labels"][0]["datas"], b"JVBERi0xLjQKJUVPRg=="
+                    )
+
+    def test_ups_send_shipping(self):
+        # Mock the dependencies
+        mock_response = {
+            "ShipmentResponse": {
+                "ShipmentResults": {
+                    "PackageResults": {
+                        "TrackingNumber": "TRACK123456",
+                        "ShippingLabel": {
+                            "ImageFormat": {"Code": "PDF"},
+                            "GraphicImage": "base64_encoded_pdf_data",
+                        },
+                    },
+                    "ShipmentCharges": {"TotalCharges": "45.99"},
+                    "ShipmentIdentificationNumber": "SHIP123456789",
+                }
+            }
+        }
+        self.picking.number_of_packages = 1
+        ups_request = UpsRequest(self.carrier)
+        with (
+            mock.patch.object(
+                ups_request, "_process_reply", return_value=mock_response
+            ),
+            mock.patch.object(ups_request, "_raise_for_status"),
+        ):
+            result = ups_request._send_shipping(self.picking)
+            self.assertEqual(result["price"], "45.99")
+            self.assertEqual(result["ShipmentIdentificationNumber"], "SHIP123456789")
+            self.assertEqual(len(result["labels"]), 1)
+            self.assertEqual(result["labels"][0]["tracking_ref"], "TRACK123456")
+            self.assertEqual(result["labels"][0]["format_code"], "PDF")
+            self.assertEqual(result["labels"][0]["datas"], "base64_encoded_pdf_data")
+
+    def test_ups_send_shipping_multi_pack(self):
+        # Mock the dependencies
+        mock_response = {
+            "ShipmentResponse": {
+                "ShipmentResults": {
+                    "PackageResults": [
+                        {
+                            "TrackingNumber": "TRACK123456",
+                            "ShippingLabel": {
+                                "ImageFormat": {"Code": "PDF"},
+                                "GraphicImage": "base64_encoded_pdf_data",
+                            },
+                        },
+                        {
+                            "TrackingNumber": "TRACK123457",
+                            "ShippingLabel": {
+                                "ImageFormat": {"Code": "PDF"},
+                                "GraphicImage": "base64_encoded_pdf_data",
+                            },
+                        },
+                    ],
+                    "ShipmentCharges": {"TotalCharges": "50.99"},
+                    "ShipmentIdentificationNumber": "SHIP22222",
+                }
+            }
+        }
+        self.picking.number_of_packages = 2
+        ups_request = UpsRequest(self.carrier)
+        with (
+            mock.patch.object(
+                ups_request, "_process_reply", return_value=mock_response
+            ),
+            mock.patch.object(ups_request, "_raise_for_status"),
+        ):
+            result = ups_request._send_shipping(self.picking)
+            self.assertEqual(result["price"], "50.99")
+            self.assertEqual(result["ShipmentIdentificationNumber"], "SHIP22222")
+            self.assertEqual(len(result["labels"]), 2)
+            self.assertEqual(result["labels"][0]["tracking_ref"], "TRACK123456")
+
+    def test_ups_send_shipping_multiple_pickings(self):
+        # Create a second picking
+        picking2 = self.picking.copy()
+        picking2.move_ids.quantity = 5
+
+        label = b"%PDF-1.4\n%EOF"
+        with mock.patch(
+            _provider_class + "._send_shipping",
+            side_effect=[
+                {
+                    "price": {"CurrencyCode": "USD", "MonetaryValue": "10.0"},
+                    "ShipmentIdentificationNumber": "123456",
+                    "labels": [
+                        {
+                            "tracking_ref": "123456",
+                            "format_code": "GIF",
+                            "datas": base64.b64encode(label),
+                        }
+                    ],
+                },
+                {
+                    "price": {"CurrencyCode": "USD", "MonetaryValue": "15.0"},
+                    "ShipmentIdentificationNumber": "789012",
+                    "labels": [
+                        {
+                            "tracking_ref": "789012",
+                            "format_code": "GIF",
+                            "datas": base64.b64encode(label),
+                        }
+                    ],
+                },
+            ],
+        ):
+            results = self.carrier.ups_send_shipping(self.picking + picking2)
+            self.assertEqual(len(results), 2)
+            self.assertEqual(results[0]["tracking_number"], "123456")
+            self.assertEqual(results[1]["tracking_number"], "789012")
+
+    def test_ups_get_label(self):
+        ups_request = UpsRequest(self.carrier)
+        carrier_tracking_ref = "1Z12345E0291980793"
+        mock_label_data = b"%PDF-1.4\nTest PDF Content\n%%EOF"
+        mock_response = {
+            "LabelRecoveryResponse": {
+                "LabelResults": {
+                    "TrackingNumber": "1Z12345E0291980793",
+                    "LabelImage": {
+                        "LabelImageFormat": {"Code": "PDF"},
+                        "GraphicImage": base64.b64encode(mock_label_data).decode(
+                            "ascii"
+                        ),
+                    },
+                }
+            }
+        }
+        with mock.patch.object(
+            ups_request, "_process_reply", return_value=mock_response
+        ):
+            with mock.patch.object(
+                ups_request,
+                "_prepare_shipping_label",
+                return_value={"TrackingNumber": carrier_tracking_ref},
+            ):
+                # Call the method
+                labels = ups_request.shipping_label(carrier_tracking_ref)
+                # Verify the result
+                self.assertEqual(len(labels), 1)
+                self.assertEqual(labels[0]["tracking_ref"], "1Z12345E0291980793")
+                self.assertEqual(labels[0]["format_code"], "PDF")
+                self.assertEqual(
+                    labels[0]["datas"],
+                    base64.b64encode(mock_label_data).decode("ascii"),
+                )
+
+    def test_shipping_label_multiple_list(self):
+        ups_request = UpsRequest(self.carrier)
+        carrier_tracking_ref = "1Z12345E0291980793"
+        mock_label1_data = b"%PDF-1.4\nTest PDF Content\n%%EOF"
+        mock_label2_data = b"%PDF-1.4\nTest PDF Content\n%%EOF"
+        mock_response = {
+            "LabelRecoveryResponse": {
+                "LabelResults": [
+                    {
+                        "TrackingNumber": "1Z12345E0291980793",
+                        "LabelImage": {
+                            "LabelImageFormat": {"Code": "GIF"},
+                            "GraphicImage": base64.b64encode(mock_label1_data).decode(
+                                "ascii"
+                            ),
+                        },
+                    },
+                    {
+                        "TrackingNumber": "1Z12345E0291980794",
+                        "LabelImage": {
+                            "LabelImageFormat": {"Code": "GIF"},
+                            "GraphicImage": base64.b64encode(mock_label2_data).decode(
+                                "ascii"
+                            ),
+                        },
+                    },
+                ]
+            }
+        }
+        with mock.patch.object(
+            ups_request, "_process_reply", return_value=mock_response
+        ):
+            with mock.patch.object(
+                ups_request,
+                "_prepare_shipping_label",
+                return_value={"TrackingNumber": carrier_tracking_ref},
+            ):
+                # Call the method
+                labels = ups_request.shipping_label(carrier_tracking_ref)
+                # Verify the result
+                self.assertEqual(len(labels), 2)
+                # Verify first label
+                self.assertEqual(labels[0]["tracking_ref"], "1Z12345E0291980793")
+                self.assertEqual(labels[0]["format_code"], "GIF")
+                self.assertEqual(
+                    labels[0]["datas"],
+                    base64.b64encode(mock_label1_data).decode("ascii"),
+                )
+                # Verify second label
+                self.assertEqual(labels[1]["tracking_ref"], "1Z12345E0291980794")
+                self.assertEqual(labels[1]["format_code"], "GIF")
+                self.assertEqual(
+                    labels[1]["datas"],
+                    base64.b64encode(mock_label2_data).decode("ascii"),
+                )
+
+    def test_ups_get_label_no_tracking_ref(self):
+        result = self.carrier.ups_get_label(False)
+        self.assertFalse(result)
+
+    def test_ups_get_tracking_link(self):
+        self.picking.carrier_tracking_ref = "123456"
+        tracking_link = self.carrier.ups_get_tracking_link(self.picking)
+        expected_link = "https://ups.com/WebTracking/track?trackingNumber=123456"
+        self.assertEqual(tracking_link, expected_link)
+
+    def test_ups_cancel_shipment(self):
+        """Test successful shipment cancellation"""
+        ups_request = UpsRequest(self.carrier)
+        self.picking.carrier_tracking_ref = "123456"
+        # Mock successful response
+        mock_response = {
+            "VoidShipmentResponse": {
+                "Response": {"ResponseStatus": {"Code": "1", "Description": "Success"}}
+            }
+        }
+        with mock.patch.object(
+            ups_request, "_process_reply", return_value=mock_response
+        ):
+            with mock.patch.object(ups_request, "_raise_for_status", return_value=True):
+                result = ups_request.cancel_shipment(self.picking)
+                self.assertTrue(result)
+
+    def test_ups_tracking_state_update(self):
+        self.picking.carrier_tracking_ref = "123456"
+        with mock.patch(
+            _provider_class + ".tracking_state_update",
+            return_value={
+                "delivery_state": "in_transit",
+                "tracking_state_history": "Test history",
+            },
+        ):
+            self.carrier.ups_tracking_state_update(self.picking)
+            self.assertEqual(self.picking.delivery_state, "in_transit")
+            self.assertEqual(self.picking.tracking_state_history, "Test history")
+
+    def test_ups_tracking_state_update_no_sync(self):
+        self.carrier.ups_tracking_state_update_sync = False
+        self.picking.carrier_tracking_ref = "123456"
+        self.carrier.ups_tracking_state_update(self.picking)
+        # Should do nothing when sync is disabled
+
+    def test_ups_tracking_state_update_no_tracking_ref(self):
+        self.picking.carrier_tracking_ref = False
+        self.carrier.ups_tracking_state_update(self.picking)
+        # Should do nothing when no tracking reference
+
+    def test_ups_get_new_token_no_credentials(self):
+        """Test _get_new_token raises UserError when no client credentials"""
+        # Set no client credentials on carrier
+        self.carrier.ups_client_id = False
+        self.carrier.ups_client_secret = False
+        # Create UpsRequest instance
+        ups_request = UpsRequest(self.carrier)
+        # Mock the _() translation function in the ups_request module
+        # This prevents translation context issues
+        with mock.patch(
+            "odoo.addons.delivery_ups_oca.models.ups_request._"
+        ) as mock_translate:
+            # Make the translation function return the string unchanged
+            mock_translate.side_effect = lambda x: x
+            # The _get_new_token method should raise UserError when no credentials
+            with self.assertRaises(UserError) as context:
+                ups_request._get_new_token()
+            # Get the exception message
+            error_msg = str(context.exception)
+            self.assertIn("Client ID", error_msg)
+            self.assertIn("Client Secret", error_msg)
+            self.assertIn("must be set", error_msg)
+
+    def test_ups_update_token(self):
+        # Test the actual token update with proper mock
+        with mock.patch(
+            _provider_class + "._get_new_token",
+            return_value=None,
+        ):
+            # Test with client_id and client_secret
+            self.carrier.ups_client_id = "test_id"
+            self.carrier.ups_client_secret = "test_secret"
+            self.carrier.ups_update_token()
+
+            # Test without client credentials
+            self.carrier.ups_client_id = False
+
+    def test_ups_update_token_expired(self):
+        # Test token update when token is expired
+        self.carrier.ups_token_expiration_date = datetime.now() - timedelta(days=1)
+        self.carrier.ups_client_id = "test_id"
+        self.carrier.ups_client_secret = "test_secret"
+
+        with mock.patch(
+            _provider_class + "._get_new_token",
+            return_value=None,
+        ):
+            self.carrier.ups_update_token()
+            # Should call _get_new_token when token is expired
+
+    def test_picking_ups_get_label_wrong_carrier(self):
+        self.picking.carrier_id.delivery_type = "fixed"
+        self.picking.carrier_tracking_ref = "123456"
+        result = self.picking.ups_get_label()
+        self.assertIsNone(result)
+
+    def test_picking_ups_get_label_no_tracking(self):
+        self.picking.carrier_tracking_ref = False
+        result = self.picking.ups_get_label()
+        self.assertIsNone(result)
+
+    def test_ups_rate_shipment_with_packages(self):
+        # Test with packages from picking
+        self.carrier.ups_use_packages_from_picking = True
+        package = self.env["stock.quant.package"].create(
+            {
+                "name": "Test Package",
+                "shipping_weight": 5,
+            }
+        )
+        self.picking.move_ids.move_line_ids.result_package_id = package.id
+
+        with mock.patch(
+            _provider_class + "._rate_shipment",
+            return_value={
+                "RateResponse": {
+                    "RatedShipment": {
+                        "TotalCharges": {"MonetaryValue": 1, "CurrencyCode": "USD"}
+                    }
+                }
+            },
+        ):
+            res = self.carrier.ups_rate_shipment(self.sale)
+            self.assertGreater(res["price"], 0)
+            self.assertTrue(res["success"])
+
+    def test_ups_label_attachment_preparation(self):
+        # Test label attachment preparation
+        picking = self.picking
+        values = {
+            "name": "test_label.GIF",
+            "datas": base64.b64encode(b"test"),
+        }
+        attachment_data = self.carrier._prepare_ups_label_attachment(picking, values)
+        self.assertEqual(attachment_data["name"], "test_label.GIF")
+        self.assertEqual(attachment_data["res_model"], picking._name)
+        self.assertEqual(attachment_data["res_id"], picking.id)
+
+    def test_ups_create_label_multiple_labels(self):
+        # Test creating multiple labels
+        label = b"%PDF-1.4\n%EOF"
+        labels = [
+            {
+                "tracking_ref": "123456",
+                "format_code": "GIF",
+                "datas": base64.b64encode(label),
+            },
+            {
+                "tracking_ref": "789012",
+                "format_code": "ZPL",
+                "datas": base64.b64encode(label),
+            },
+        ]
+        attachments = self.carrier._create_ups_label(self.picking, labels)
+        self.assertEqual(len(attachments), 2)
+        self.assertEqual(attachments[0].name, "123456-GIF.GIF")
+        self.assertEqual(attachments[1].name, "789012-ZPL.ZPL")
+
+    def _patch_carrier_log_xml(self):
+        """Helper to patch the log_xml method on carrier class"""
+        return mock.patch.object(type(self.carrier), "log_xml")
+
+    def test_ups_process_reply_basic_success_with_helper(self):
+        """Test using helper method for patching"""
+        # Set up a valid token
+        future_date = datetime.now() + timedelta(hours=1)
+        self.carrier.ups_token = "valid_token_123"
+        self.carrier.ups_token_expiration_date = future_date
+
+        ups_request = UpsRequest(self.carrier)
+
+        # Mock the HTTP response
+        mock_response = mock.Mock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {"success": True, "data": "test_data"}
+
+        with mock.patch.object(
+            ups_request, "_send_request", return_value=mock_response
+        ):
+            # Use the helper method
+            with self._patch_carrier_log_xml() as mock_log:
+                result = ups_request._process_reply(
+                    url="https://api.test.com/endpoint",
+                    json={"key": "value"},
+                    method="post",
+                    headers_extra={"Content-Type": "application/json"},
+                )
+                # Verify result
+                self.assertEqual(result, {"success": True, "data": "test_data"})
+                self.assertEqual(mock_log.call_count, 2)
+
+    def test_ups_prepare_create_shipping_with_packages(self):
+        """Test _prepare_create_shipping with packages from picking"""
+        # Enable use packages from picking
+        self.carrier.ups_use_packages_from_picking = True
+
+        ups_request = UpsRequest(self.carrier)
+
+        # Create test packages
+        package1 = self.env["stock.quant.package"].create(
+            {
+                "name": "Package 1",
+                "shipping_weight": 5.0,
+            }
+        )
+        # Create package type
+        package_type1 = self.env["stock.package.type"].create(
+            {
+                "name": "Test Package Type - 001",
+                "shipper_package_code": "001",
+                "packaging_length": 10.0,
+                "width": 8.0,
+                "height": 6.0,
+            }
+        )
+        package1.package_type_id = package_type1
+        package2 = self.env["stock.quant.package"].create(
+            {
+                "name": "Package 2",
+                "shipping_weight": 3.0,
+            }
+        )
+        # Create package type
+        package_type2 = self.env["stock.package.type"].create(
+            {
+                "name": "Test Package Type - 002",
+                "shipper_package_code": "002",
+                "packaging_length": 10.0,
+                "width": 8.0,
+                "height": 6.0,
+            }
+        )
+        package2.package_type_id = package_type2
+
+        # Set packages on move lines
+        self.picking.move_ids.move_line_ids = [
+            (
+                0,
+                0,
+                {
+                    "result_package_id": package1.id,
+                    "product_id": self.product.id,
+                    "quantity": 2,
+                },
+            ),
+            (
+                0,
+                0,
+                {
+                    "result_package_id": package2.id,
+                    "product_id": self.product.id,
+                    "quantity": 3,
+                },
+            ),
+        ]
+
+        # Set picking data
+        self.picking.name = "TEST0001"
+        self.picking.shipping_weight = 8.0  # 5 + 3
+        self.picking.number_of_packages = 2
+
+        # Prepare shipping data
+        result = ups_request._prepare_create_shipping(self.picking)
+        packages = result["ShipmentRequest"]["Shipment"]["Package"]
+        self.assertEqual(len(packages), 2)
+        # Verify package descriptions
+        self.assertEqual(packages[0]["Description"], package_type1.name)
+        self.assertEqual(packages[1]["Description"], package_type2.name)
+        # Verify service code
+        self.assertEqual(result["ShipmentRequest"]["Shipment"]["Service"]["Code"], "11")
+        # Verify label specification
+        self.assertIn("LabelSpecification", result["ShipmentRequest"])
+        self.assertEqual(
+            result["ShipmentRequest"]["LabelSpecification"]["LabelImageFormat"]["Code"],
+            "GIF",
+        )
+
+    def test_ups_prepare_create_shipping_without_packages(self):
+        """Test _prepare_create_shipping without packages (uses default packaging)"""
+        self.carrier.ups_use_packages_from_picking = False
+
+        ups_request = UpsRequest(self.carrier)
+
+        # Set picking data
+        self.picking.name = "TEST0002"
+        self.picking.shipping_weight = 30.0
+        self.picking.number_of_packages = 3
+
+        # # Create default packaging
+        default_packaging = self.env["stock.package.type"].create(
+            {
+                "name": "UPS Box",
+                "package_carrier_type": "ups",
+                "shipper_package_code": "02",
+                "packaging_length": 12.0,
+                "width": 10.0,
+                "height": 8.0,
+            }
+        )
+        self.carrier.ups_default_packaging_id = default_packaging
+
+        # Prepare shipping data
+        result = ups_request._prepare_create_shipping(self.picking)
+
+        # Verify structure
+        packages = result["ShipmentRequest"]["Shipment"]["Package"]
+        self.assertEqual(len(packages), 3)  # Should create 3 packages
+
+        # Each package should have weight = 30/3 = 10.0
+        for i, package in enumerate(packages):
+            self.assertEqual(package["Description"], f"TEST0002 ({i+1})")
+            self.assertEqual(package["NumOfPieces"], "1")
+            self.assertEqual(package["PackageWeight"]["Weight"], "10.0")  # 30/3 = 10
+            self.assertEqual(package["Packaging"]["Code"], "02")
+
+    def test_ups_prepare_create_shipping_with_cash_on_delivery(self):
+        """Test _prepare_create_shipping with cash on delivery"""
+        # Enable cash on delivery
+        self.carrier.ups_cash_on_delivery = True
+        self.carrier.ups_cod_funds_code = "1"  # Cash
+        ups_request = UpsRequest(self.carrier)
+        # Set sale order amount
+        self.sale.amount_total = 11.5
+        self.sale.currency_id = self.env.ref("base.USD")
+        # Ensure picking is linked to sale order
+        self.picking.sale_id = self.sale
+        # Set picking data
+        self.picking.name = "TEST0006"
+        self.picking.shipping_weight = 8.0
+        self.picking.number_of_packages = 2
+        # Prepare shipping data
+        result = ups_request._prepare_create_shipping(self.picking)
+        # Verify cash on delivery data is included
+        shipment = result["ShipmentRequest"]["Shipment"]
+        self.assertIn("ShipmentServiceOptions", shipment)
+        cod_data = shipment["ShipmentServiceOptions"][0]["COD"]
+        self.assertEqual(cod_data["CODFundsCode"], "1")
+        self.assertEqual(cod_data["CODAmount"]["CurrencyCode"], "USD")
+        self.assertEqual(cod_data["CODAmount"]["MonetaryValue"], "11.5")
+        # Verify other shipment details
+        self.assertEqual(shipment["Description"], "TEST0006")
+        self.assertEqual(shipment["Service"]["Code"], "11")
+        self.assertEqual(len(shipment["Package"]), 2)

{odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info → odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: odoo-addon-delivery_ups_oca
-Version: 17.0.1.0.0.4
+Version: 18.0.1.0.0.2
 Requires-Python: >=3.10
-Requires-Dist: odoo-addon-delivery_package_number>=17.0dev,<17.1dev
-Requires-Dist: odoo-addon-delivery_price_method>=17.0dev,<17.1dev
-Requires-Dist: odoo-addon-delivery_state>=17.0dev,<17.1dev
-Requires-Dist: odoo>=17.0a,<17.1dev
+Requires-Dist: odoo-addon-delivery_package_number==18.0.*
+Requires-Dist: odoo-addon-delivery_price_method==18.0.*
+Requires-Dist: odoo-addon-delivery_state==18.0.*
+Requires-Dist: odoo==18.0.*
 Summary: Integrate UPS webservice
 Home-page: https://github.com/OCA/delivery-carrier
 License: AGPL-3
@@ -13,7 +13,7 @@ Author: Hunki Enterprises BV, Tecnativa, ForgeFlow, Odoo Community Association (
 Author-email: support@odoo-community.org
 Classifier: Programming Language :: Python
 Classifier: Framework :: Odoo
-Classifier: Framework :: Odoo :: 17.0
+Classifier: Framework :: Odoo :: 18.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Development Status :: 4 - Beta
 Description-Content-Type: text/x-rst
@@ -31,7 +31,7 @@ Delivery UPS OCA
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5c5c1b09dfe20724c425c5b6c39f037b475f251b53e312baa365316b53fad92d
+   !! source digest: sha256:a822b00c048a67361ef9e4de24e3d5f6ba436b9cd140e4b3ac4c87585d999b73
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -41,13 +41,13 @@ Delivery UPS OCA
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
-    :target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_ups_oca
+    :target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca
     :alt: OCA/delivery-carrier
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_ups_oca
+    :target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_ups_oca
     :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/delivery-carrier&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -117,7 +117,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/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/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2018.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.
 
@@ -162,6 +162,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_ups_oca>`_ project on GitHub.
+This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

{odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info → odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info}/RECORD

@@ -1,26 +1,26 @@
-odoo/addons/delivery_ups_oca/README.rst,sha256=8rBIYzMyymUxo8nHD-pOuguEYb5JuzVsfOHv_mqEbJQ,5291
+odoo/addons/delivery_ups_oca/README.rst,sha256=aK7qzFNoYeQAi5Q71zd6NkA_Fdv6LUIg3Atmk0VRzyw,5291
 odoo/addons/delivery_ups_oca/__init__.py,sha256=eShEGRadAlxopoLqIQ4-N42FM7MWPSuBe0h_l1cXTPM,87
-odoo/addons/delivery_ups_oca/__manifest__.py,sha256=YsB6Xukwk7WoqkTSicRQ2s1SuOdL9LeBmWDxLTg5a2A,845
+odoo/addons/delivery_ups_oca/__manifest__.py,sha256=Sh0feY3gCZHwYHY7i6nvPfuefS4-OhAlLnqVCckd6WQ,845
 odoo/addons/delivery_ups_oca/data/stock_package_type_data.xml,sha256=PhFMtGKBmbdaokX8F3gasubzAIIOgmxoa0lwkwbetEw,5691
-odoo/addons/delivery_ups_oca/i18n/delivery_ups_oca.pot,sha256=X6zrMobX0kOQX9m-zRw74GQbmUdZDgC3w985a1isYQ4,13026
+odoo/addons/delivery_ups_oca/i18n/delivery_ups_oca.pot,sha256=JIEdykm7RiigIDQj6asWKJH--ncCdyBFBApphENfRDw,12966
 odoo/addons/delivery_ups_oca/i18n/it.po,sha256=NQfcUHYFGyC08-sBbSlP-N1Fn4f4zn0sSWPVEGF1aqw,19817
 odoo/addons/delivery_ups_oca/models/__init__.py,sha256=yuukCOHXALZomJz8kz97Y1mbp_uXm6h8wNc3UqbOcVU,183
-odoo/addons/delivery_ups_oca/models/delivery_carrier.py,sha256=-4gHbfS8itvPAP8nXSlHf6RIH8fQF5jmwNj_iuzldbE,8090
+odoo/addons/delivery_ups_oca/models/delivery_carrier.py,sha256=l4tcha_lwhXHqR54emqalKWxZbDtsdWzcEV08kBBQmI,8072
 odoo/addons/delivery_ups_oca/models/stock_package_type.py,sha256=nraw8nT02RRIRbP1ulh_6vqYnorPaWOzcSemzqdmEDs,283
 odoo/addons/delivery_ups_oca/models/stock_picking.py,sha256=TNroETJZ0JJAP5Nttvv0qZWeetHZ7ZuUzxXGgmZsGm8,446
-odoo/addons/delivery_ups_oca/models/ups_request.py,sha256=trYb58tL9llfUXdbzdO5Uul7GbCi8xEr6uMz7o0eLVo,16720
+odoo/addons/delivery_ups_oca/models/ups_request.py,sha256=5vTYEicw54980mbiY74VDj_9U4ELOAB0L3VqWwxXmlM,16847
 odoo/addons/delivery_ups_oca/readme/CONFIGURE.md,sha256=mDViGpGJ8BtEC-Gm60D47C5tmaUUvG_lZZRPfUqkmlI,878
 odoo/addons/delivery_ups_oca/readme/CONTRIBUTORS.md,sha256=5rRwa8H463CvvXeLURAeGnmMrb0eWAHTyutPGXbr-0A,279
 odoo/addons/delivery_ups_oca/readme/DESCRIPTION.md,sha256=i8wS58sFjqj3r0AkEFUAeg3_q54AQQaO3LvMMTnxNf4,475
 odoo/addons/delivery_ups_oca/readme/ROADMAP.md,sha256=lx0aOESEhWHxzdOlvp4giX3Py3izFcSxk3XIY_eUD00,64
 odoo/addons/delivery_ups_oca/readme/USAGE.md,sha256=aqWOcJ4GIbsoxkXOpJJAIOWwbvAfSEnsqDG-NGjfTbE,547
 odoo/addons/delivery_ups_oca/static/description/icon.png,sha256=KYPV9VXO6IFBW-uC3sbMyoLtQGvPtl3b7O8W1VgikwA,38594
-odoo/addons/delivery_ups_oca/static/description/index.html,sha256=AbMLf93CF8HFfIbWjs0zOEVufDaqKEMCZSS5sfe8qoY,15910
+odoo/addons/delivery_ups_oca/static/description/index.html,sha256=J0Kt_lvFd38rX7wiJcK7M4U3pV8YYNRbsVfjQBWTCNg,15910
 odoo/addons/delivery_ups_oca/tests/__init__.py,sha256=RRkl0Vake-JsHRO2NhaW2M3itoAWIp2MnZeQ2Uq4vs0,98
-odoo/addons/delivery_ups_oca/tests/test_delivery_ups.py,sha256=KTTrObhWl7TctbnhHQRsZKZnxI1Wlq7mW26CSoeZWG0,6304
+odoo/addons/delivery_ups_oca/tests/test_delivery_ups.py,sha256=oJgMpQfZfBi1p9mO3VlQ-XeUu1NS1BPapI-BIioHyEA,33197
 odoo/addons/delivery_ups_oca/views/delivery_carrier_view.xml,sha256=YIG7BbpZFr7Jc3uAz3lYu-U37n_EYWGmBdz1NxHF1sI,3734
 odoo/addons/delivery_ups_oca/views/stock_picking_view.xml,sha256=OeasGlIKNxTUNLAzNXXM7TPSeUdCm5Sxt2ZQrzmxy90,851
-odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info/METADATA,sha256=RWPFY0-84iC3azOclikIM47HxEtosTvJ1iJLW104pO8,6117
-odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_delivery_ups_oca-17.0.1.0.0.4.dist-info/RECORD,,
+odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info/METADATA,sha256=G7JRbM7s-ekDqdzQUFPrcEkZ5ucogGfpqfrEh0TTbEk,6079
+odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_delivery_ups_oca-18.0.1.0.0.2.dist-info/RECORD,,