fixup! [MIG] delivery_postlogistics: Migration to 18.0

Author: StephaneMangin

delivery_postlogistics/__manifest__.py

@@ -22,6 +22,7 @@
         "data/partner.xml",
         "data/product.xml",
         "data/delivery.xml",
+        "data/package_type.xml",
         "views/delivery.xml",
         "views/stock_package_type_view.xml",
         "views/stock_quant_package_view.xml",

delivery_postlogistics/data/package_type.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2025 Camptocamp SA
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo noupdate="1">
+    <record id="postlogistics_default_package_type" model="stock.package.type">
+        <field name="name">PostLogistics Default Package Type</field>
+        <field name="shipper_package_code">ECO</field>
+        <field name="package_carrier_type">postlogistics</field>
+        <field name="company_id" ref="base.main_company" />
+    </record>
+</odoo>

delivery_postlogistics/models/delivery_carrier.py

@@ -96,6 +96,14 @@ class DeliveryCarrier(models.Model):
         string="ZPL Patch String", default="^XA^CW0,E:TT0003M_.TTF^XZ^XA^CI28"
     )
 
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        res["postlogistics_default_package_type_id"] = self.env.ref(
+            "delivery_postlogistics.postlogistics_default_package_type",
+            raise_if_not_found=False,
+        ).id
+        return res
+
     @api.onchange("prod_environment")
     def onchange_prod_environment(self):
         """
@@ -133,9 +141,18 @@ def postlogistics_send_shipping(self, pickings):
         It will generate the labels for all the packages of the picking.
         Packages are mandatory in this case
         """
-        for pick in pickings:
-            pick._set_a_default_package()
-            pick._generate_postlogistics_label()
+        for picking in pickings:
+            carrier = picking.carrier_id
+            move_lines = picking.move_line_ids.filtered(
+                lambda s: not (s.package_id or s.result_package_id)
+            )
+            if move_lines:
+                default_packaging = carrier.postlogistics_default_package_type_id
+                package = self.env["stock.quant.package"].create(
+                    [{"package_type_id": default_packaging.id}]
+                )
+                move_lines.write({"result_package_id": package.id})
+            picking._generate_postlogistics_label()
 
         return [{"exact_price": False, "tracking_number": False}]
 

delivery_postlogistics/models/stock_picking.py

@@ -72,27 +72,6 @@ def attach_shipping_label(self, label):
             self.env["shipping.label"].with_context(**context_attachment).create(data)
         )
 
-    def _set_a_default_package(self):
-        """Pickings using this module must have a package
-        If not this method put it one silently
-        """
-        # TODO: consider to depends on base_delivery_carrier_label
-        for picking in self:
-            move_lines = picking.move_line_ids.filtered(
-                lambda s: not (s.package_id or s.result_package_id)
-            )
-            if move_lines:
-                carrier = picking.carrier_id
-                default_packaging = carrier.postlogistics_default_package_type_id
-                package = self.env["stock.quant.package"].create(
-                    {
-                        "package_type_id": default_packaging
-                        and default_packaging.id
-                        or False
-                    }
-                )
-                move_lines.write({"result_package_id": package.id})
-
     def postlogistics_cod_amount(self):
         """Return the PostLogistics Cash on Delivery amount of a picking
 
@@ -183,7 +162,7 @@ def write_tracking_number_label(self, label_result, packages):
         return labels
 
     def _generate_postlogistics_label(
-        self, webservice_class=None, package_ids=None, skip_attach_file=False
+        self, webservice_class=None, packages=None, skip_attach_file=False
     ):
         """Generate labels and write tracking numbers received"""
         self.ensure_one()
@@ -192,13 +171,9 @@ def _generate_postlogistics_label(
         if webservice_class is None:
             webservice_class = PostlogisticsWebService
 
-        if package_ids is None:
+        if packages is None:
             packages = self._get_quant_packages_from_picking()
-            packages = packages.sorted(key=attrgetter("name"))
-        else:
-            # restrict on the provided packages
-            package_obj = self.env["stock.quant.package"]
-            packages = package_obj.browse(package_ids)
+        packages = packages.sorted(key=attrgetter("name"))
 
         web_service = webservice_class(company)
 
@@ -242,10 +217,10 @@ def _cleanup_error_message(self, error_message):
         texts = [text for text in texts_no_html.split("\n") if text]
         return "\n".join(texts)
 
-    def generate_postlogistics_shipping_labels(self, package_ids=None):
+    def generate_postlogistics_shipping_labels(self, packages=None):
         """Add label generation for PostLogistics"""
         self.ensure_one()
-        return self._generate_postlogistics_label(package_ids=package_ids)
+        return self._generate_postlogistics_label(packages=packages)
 
     def action_generate_carrier_label(self):
         self.ensure_one()

delivery_postlogistics/postlogistics/web_service.py

@@ -224,15 +224,15 @@ def _prepare_attributes(
             and pack.package_type_id
             or picking.carrier_id.postlogistics_default_package_type_id
         )
-        services = package_type._get_shipper_package_code_list()
+        package_codes = package_type._get_shipper_package_code_list()
 
         if pack_weight:
             total_weight = pack_weight
         else:
             total_weight = pack.shipping_weight if pack else picking.shipping_weight
         total_weight *= 1000
 
-        if not services:
+        if not package_codes:
             raise UserError(
                 picking.env._(
                     "No PostLogistics packaging services found "
@@ -243,51 +243,51 @@ def _prepare_attributes(
         # Activate phone notification ZAW3213
         # if phone call notification is set on partner
         if picking.partner_id.postlogistics_notification == "phone":
-            services.append("ZAW3213")
+            package_codes.append("ZAW3213")
 
         attributes = {
             "weight": int(total_weight),
         }
 
         # Remove the services if the delivery fixed date is not set
-        if "ZAW3217" in services:
+        if "ZAW3217" in package_codes:
             if picking.delivery_fixed_date:
                 attributes["deliveryDate"] = picking.delivery_fixed_date
             else:
-                services.remove("ZAW3217")
+                package_codes.remove("ZAW3217")
 
         # parcelNo / parcelTotal cannot be used if service ZAW3218 is not activated
-        if "ZAW3218" in services:
+        if "ZAW3218" in package_codes:
             if pack_total > 1:
                 attributes.update(
                     {"parcelTotal": pack_total - 1, "parcelNo": pack_num - 1}
                 )
             else:
-                services.remove("ZAW3218")
+                package_codes.remove("ZAW3218")
 
-        if "ZAW3219" in services and picking.delivery_place:
+        if "ZAW3219" in package_codes and picking.delivery_place:
             attributes["deliveryPlace"] = picking.delivery_place
         if picking.carrier_id.postlogistics_proclima_logo:
             attributes["proClima"] = True
         else:
             attributes["proClima"] = False
 
-        attributes["przl"] = services
+        attributes["przl"] = package_codes
 
         return attributes
 
-    def _get_itemid(self, picking, pack_no):
+    def _get_itemid(self, picking, package):
         """Allowed characters are alphanumeric plus `+`, `-` and `_`
         Last `+` separates picking name and package number (if any)
 
         :return string: itemid
 
         """
         name = _compile_itemid.sub("", picking.name)
-        if not pack_no:
+        if not package:
             return name
 
-        pack_no = _compile_itemid.sub("", pack_no)
+        pack_no = _compile_itemid.sub("", package.name)
         codes = [name, pack_no]
         return "+".join(c for c in codes if c)
 
@@ -312,7 +312,7 @@ def _get_item_additional_data(self, picking, package=None):
             result += cod_attributes
         return result
 
-    def _get_item_number(self, picking, pack_num):
+    def _get_item_number(self, picking, package):
         """Generate the tracking reference for the last 8 digits
         of tracking number of the label.
 
@@ -322,15 +322,14 @@ def _get_item_number(self, picking, pack_num):
         e.g. 03000042 for 3rd pack of picking OUT/19000042
         """
         picking_num = _compile_itemnum.sub("", picking.name)
-        return "%02d%s" % (pack_num, picking_num[-6:].zfill(6))
+        return "%02d%s" % (package.name, picking_num[-6:].zfill(6))
 
     def _prepare_item_list(self, picking, recipient, packages):
         """Return a list of item made from the pickings"""
         carrier = picking.carrier_id
         item_list = []
-        pack_counter = 1
 
-        def add_item(package=None):
+        def add_item(counter=1, package=None):
             assert picking or package
             itemid = self._get_itemid(picking, package.name if package else None)
             item = {
@@ -345,7 +344,7 @@ def add_item(package=None):
                     picking_num = _compile_itemnum.sub("", picking.name)
                     item_number = f"9{picking_num[-7:].zfill(7)}"
                 else:
-                    item_number = self._get_item_number(picking, pack_counter)
+                    item_number = self._get_item_number(picking, counter)
                 item["itemNumber"] = item_number
 
             additional_data = self._get_item_additional_data(picking, package=package)
@@ -354,18 +353,15 @@ def add_item(package=None):
 
             item_list.append(item)
 
-        if not packages:
-            attributes = self._prepare_attributes(picking)
-            add_item()
-            return item_list
-
-        pack_total = len(packages)
-        for pack in packages:
+        total_packages = len(packages)
+        for index, package in enumerate(packages):
             attributes = self._prepare_attributes(
-                picking, pack, pack_counter, pack_total
+                picking, package, index, total_packages
             )
-            add_item(package=pack)
-            pack_counter += 1
+            add_item(counter=index, package=package)
+        else:
+            attributes = self._prepare_attributes(picking)
+            add_item()
         return item_list
 
     def _prepare_label_definition(self, picking):