[MIG] delivery_roulier: Migration to 17.0

Author: yankinmax

delivery_roulier/__manifest__.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Delivery Carrier Roulier",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Akretion,Odoo Community Association (OCA)",
     "summary": "Integration of multiple carriers",
     "maintainers": ["florian-dacosta"],

delivery_roulier/decorator.py

@@ -34,7 +34,7 @@ def get_delivery_type(cls, *args, **kwargs):
                 return cls[0].carrier_id.delivery_type
 
         delivery_type = get_delivery_type(cls, *args, **kwargs)
-        fun = "_{}{}".format(delivery_type, fun_name)
+        fun = f"_{delivery_type}{fun_name}"
         if not hasattr(cls, fun):
             fun = "_roulier%s" % (fun_name)
         return getattr(cls, fun)(*args, **kwargs)

delivery_roulier/models/delivery_carrier.py

@@ -1,15 +1,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import logging
+from roulier import roulier
 
 from odoo import models
 
-_logger = logging.getLogger(__name__)
-try:
-    from roulier import roulier
-except ImportError:
-    _logger.debug("Cannot `import roulier`.")
-
 
 class DeliveryCarrier(models.Model):
     _inherit = "delivery.carrier"

delivery_roulier/models/stock_picking.py

@@ -84,7 +84,7 @@ def _roulier_generate_labels(self):
         label_info = []
         for picking in self:
             move_line_no_pack = picking.move_line_ids.filtered(
-                lambda ml: ml.qty_done > 0.0 and not ml.result_package_id
+                lambda ml: ml.quantity > 0.0 and not ml.result_package_id
             )
             if move_line_no_pack:
                 raise UserError(

delivery_roulier/models/stock_quant_package.py

@@ -112,24 +112,22 @@ def _roulier_parse_response(self, picking, response):
             # find for which package the label is. tracking number will be updated on
             # this pack later on (in base_delivery_carrier_label)
             package_id = False
+            ref = parcel.get("reference")
             if len(self) == 1:
                 package_id = self.id
             else:
-                pack = self.filtered(lambda p: p.name == parcel.get("reference"))
+                pack = self.filtered(lambda p, ref=ref: p.name == ref)
                 if len(pack) == 1:
                     package_id = pack.id
-
+            name_prefix = ref or tracking_number or label.get("name")
+            name_suffix = label.get("type", "").lower()
             parcels_data.append(
                 {
                     "tracking_number": tracking_number,
                     "parcel_tracking_uri": parcel.get("tracking", {}).get("url", False),
                     "package_id": package_id,
                     "file": label.get("data"),
-                    "name": "%s.%s"
-                    % (
-                        parcel.get("reference") or tracking_number or label.get("name"),
-                        label.get("type", "").lower(),
-                    ),
+                    "name": f"{name_prefix}.{name_suffix}",
                     "file_type": label.get("type"),
                 }
             )
@@ -287,8 +285,7 @@ def _roulier_prepare_attachments(self, picking, response):
                 "res_model": "stock.picking",
                 "datas": attachment["data"],
                 "type": "binary",
-                "name": "%s-%s.%s"
-                % (self.name, attachment["name"], attachment["type"]),
+                "name": f"{self.name}-{attachment['name']}.{attachment['type']}",
             }
             for attachment in attachments
         ]

delivery_roulier/tests/test_delivery_roulier.py

@@ -27,6 +27,7 @@ class DeliveryRoulierCase(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
         cls.loader = FakeModelLoader(cls.env, cls.__module__)
         cls.loader.backup_registry()
 
@@ -35,32 +36,29 @@ def setUpClass(cls):
 
         cls.loader.update_registry((FakeDeliveryCarrier,))
         cls.real_get_carriers_action_available = roulier.get_carriers_action_available
-
-    def setUp(self):
-        super().setUp()
-        delivery_product = self.env["product.product"].create(
+        delivery_product = cls.env["product.product"].create(
             {"name": "test shipping product", "type": "service"}
         )
-        self.account = self.env["carrier.account"].create(
+        cls.account = cls.env["carrier.account"].create(
             {
                 "name": "Test Carrier Account",
                 "delivery_type": "test",
                 "account": "test",
                 "password": "test",
             }
         )
-        self.test_carrier = self.env["delivery.carrier"].create(
+        cls.test_carrier = cls.env["delivery.carrier"].create(
             {
                 "name": "Test Carrier",
                 "delivery_type": "test",
                 "product_id": delivery_product.id,
-                "carrier_account_id": self.account.id,
+                "carrier_account_id": cls.account.id,
             }
         )
-        partner = self.env["res.partner"].create(
+        partner = cls.env["res.partner"].create(
             {
                 "name": "Carrier label test customer",
-                "country_id": self.env.ref("base.fr").id,
+                "country_id": cls.env.ref("base.fr").id,
                 "street": "test street",
                 "street2": "test street2",
                 "city": "test city",
@@ -69,30 +67,27 @@ def setUp(self):
                 "zip": "00000",
             }
         )
-        product = self.env["product.product"].create(
+        product = cls.env["product.product"].create(
             {"name": "Carrier test product", "type": "product", "weight": 1.2}
         )
-        self.order = self.env["sale.order"].create(
+        cls.order = cls.env["sale.order"].create(
             {
-                "carrier_id": self.test_carrier.id,
+                "carrier_id": cls.test_carrier.id,
                 "partner_id": partner.id,
                 "order_line": [
                     (0, 0, {"product_id": product.id, "product_uom_qty": 1})
                 ],
             }
         )
-        self.env["stock.quant"].with_context(inventory_mode=True).create(
+        cls.env["stock.quant"].with_context(inventory_mode=True).create(
             {
                 "product_id": product.id,
-                "location_id": self.order.warehouse_id.lot_stock_id.id,
+                "location_id": cls.order.warehouse_id.lot_stock_id.id,
                 "inventory_quantity": 1,
             }
-        )._apply_inventory()
-        self.order.action_confirm()
-        self.picking = self.order.picking_ids
-        self.env["stock.immediate.transfer"].create(
-            {"pick_ids": [(6, 0, self.picking.ids)]}
-        ).process()
+        ).action_apply_inventory()
+        cls.order.action_confirm()
+        cls.picking = cls.order.picking_ids
 
     @classmethod
     def tearDownClass(cls):

requirements.txt

@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+roulier

test-requirements.txt

@@ -0,0 +1,2 @@
+# delivery_roulier
+odoo_test_helper