[MIG] delivery_carrier_label_gls: Migration to 14.0

delivery_carrier_label_gls/__manifest__.py

@@ -9,11 +9,7 @@
     "maintener": "Akretion",
     "category": "Warehouse",
     "summary": "GLS carrier label printing",
-    "depends": [
-        "base_delivery_carrier_label",
-        "delivery",
-        "delivery_carrier_account",
-    ],
+    "depends": ["base_delivery_carrier_label", "delivery"],
     "website": "https://github.com/OCA/delivery-carrier",
     "data": [
         "security/groups.xml",
@@ -22,7 +18,7 @@
         "data/product_product.xml",
         "data/carrier_account.xml",
         "data/delivery_carrier.xml",
-        "data/stock_package_type.xml",
+        "data/product_packaging.xml",
         "views/res_config_settings.xml",
         "views/delivery_carrier.xml",
         "views/delivery_report_gls.xml",

delivery_carrier_label_gls/data/stock_package_type.xml → delivery_carrier_label_gls/data/product_packaging.xml

@@ -2,19 +2,19 @@
 <!-- Copyright 2021 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo noupdate="1">
-  <record id="packaging_gls_parcel" model="stock.package.type">
+  <record id="product_packaging_gls_parcel" model="product.packaging">
     <field name="name">GLS: Parcel</field>
     <field name="package_carrier_type">gls</field>
     <field name="shipper_package_code">PARCEL</field>
     <field name="max_weight">40</field>
   </record>
-  <record id="packaging_gls_express" model="stock.package.type">
+  <record id="product_packaging_gls_express" model="product.packaging">
     <field name="name">GLS: Express</field>
     <field name="package_carrier_type">gls</field>
     <field name="shipper_package_code">EXPRESS</field>
     <field name="max_weight">40</field>
   </record>
-  <record id="packaging_gls_freight" model="stock.package.type">
+  <record id="product_packaging_gls_freight" model="product.packaging">
     <field name="name">GLS: Freight</field>
     <field name="package_carrier_type">gls</field>
     <field name="shipper_package_code">FREIGHT</field>

delivery_carrier_label_gls/models/__init__.py

@@ -1,8 +1,8 @@
 from . import delivery_carrier
 from . import delivery_report_gls
+from . import product_packaging
 from . import res_partner
 from . import sale_order
 from . import shipping_label
 from . import stock_picking
 from . import stock_quant_package
-from . import stock_package_type

delivery_carrier_label_gls/models/delivery_carrier.py

@@ -19,6 +19,14 @@ class DeliveryCarrier(models.Model):
         },
     )
 
+    # Backport
+    carrier_account_id = fields.Many2one(
+        "carrier.account",
+        string="Account",
+        company_dependent=True,
+        domain="[('delivery_type', '=', delivery_type)]",
+    )
+
     gls_contact_id = fields.Char(
         string="International",
         size=10,

delivery_carrier_label_gls/models/stock_package_type.py → delivery_carrier_label_gls/models/product_packaging.py

@@ -4,8 +4,8 @@
 from odoo import fields, models
 
 
-class PackageType(models.Model):
-    _inherit = "stock.package.type"
+class ProductPackaging(models.Model):
+    _inherit = "product.packaging"
 
     package_carrier_type = fields.Selection(
         selection_add=[("gls", "GLS")],

delivery_carrier_label_gls/models/stock_picking.py

@@ -26,7 +26,7 @@ class StockPicking(models.Model):
 
     def _check_is_everything_packaged(self):
         for picking in self:
-            if not all(o.result_package_id for o in picking.move_ids.move_line_ids):
+            if not all(o.result_package_id for o in picking.move_lines.move_line_ids):
                 msg = _("For GLS every operation should be put in a pack.")
                 raise ValidationError(msg)
 
@@ -37,7 +37,7 @@ def button_validate(self):
         return super().button_validate()
 
     def gls_send_shipping(self, delivery_carrier=False):
-        for package in self.move_ids.move_line_ids.result_package_id:
+        for package in self.move_lines.move_line_ids.result_package_id:
             if not package.parcel_tracking:
                 self.gls_send_shipping_package(package)
         return self.carrier_tracking_ref

delivery_carrier_label_gls/models/stock_quant_package.py

@@ -52,7 +52,7 @@ def gls_validate_package(self):
         self.ensure_one()
         package_name = self.name or self.id
         allowed_product_types = ["PARCEL", "EXPRESS", "FREIGHT"]
-        if self.package_type_id.shipper_package_code not in allowed_product_types:
+        if self.packaging_id.shipper_package_code not in allowed_product_types:
             msg = _(
                 f"The GLS package code for package {package_name} should be "
                 f"in {allowed_product_types}."
@@ -70,7 +70,7 @@ def _gls_prepare_shipment(self):
         reference = (self.gls_picking_id.name or f"PICKING{self.id}")[:40]
         partner = self.gls_picking_id.partner_id
         return {
-            "Product": self.package_type_id.shipper_package_code,
+            "Product": self.packaging_id.shipper_package_code,
             "Consignee": {"Address": partner._gls_prepare_address()},
             "ShipmentUnit": [{"Weight": "{:05.2f}".format(weight)}],
             "ShipmentReference": [reference],

delivery_carrier_label_gls/readme/CONTRIBUTORS.rst

@@ -2,3 +2,4 @@
 * Nans Lefebvre <nans.lefebvre@acsone.eu>
 * Laurent Mignon <laurent.mignon@acsone.eu>
 * Hughes Damry <hughes.damry@acsone.eu>
+* Florian Mounier <florian.mounier@akretion.com>

delivery_carrier_label_gls/tests/common.py

@@ -4,10 +4,10 @@
 from contextlib import contextmanager
 from unittest import mock
 
-from odoo.tests.common import TransactionCase
+from odoo.tests.common import SavepointCase
 
 
-class TestGLS(TransactionCase):
+class TestGLS(SavepointCase):
     @classmethod
     def _get_gls_carrier_vals(cls):
         return {

delivery_carrier_label_gls/tests/test_flow.py

@@ -33,7 +33,7 @@ def test_flow(self):
         # given
         # pack_operation = picking.pack_operation_ids
         # pack_operation.qty_done = pack_operation.product_qty
-        picking.move_ids.write({"quantity_done": 5})
+        picking.move_lines.write({"quantity_done": 5})
         # when
         pack_action = picking.action_put_in_pack()
         pack_action_ctx = pack_action["context"]
@@ -50,9 +50,9 @@ def test_flow(self):
         )
 
         # given
-        parcel_xmlid = "delivery_carrier_label_gls.packaging_gls_parcel"
+        parcel_xmlid = "delivery_carrier_label_gls.product_packaging_gls_parcel"
         packaging_parcel = self.env.ref(parcel_xmlid)
-        pack_wiz.delivery_package_type_id = packaging_parcel
+        pack_wiz.delivery_packaging_id = packaging_parcel
         self.assertNotEqual(pack_wiz.shipping_weight, 0.0)
         pack_wiz.action_put_in_pack()
 

delivery_carrier_label_gls/views/delivery_report_gls.xml

@@ -12,7 +12,7 @@
               <field name="display_name" />
               <field name="parcel_tracking" />
               <field name="shipping_weight" />
-              <field name="package_type_id" />
+              <field name="packaging_id" />
             </tree>
           </field>
         </group>

delivery_carrier_label_gls/views/res_config_settings.xml

@@ -26,7 +26,7 @@
                         <div class="content-group">
                             <div class="mt8">
                                 <button
-                                    name="%(delivery_carrier_account.action_carrier_account)d"
+                                    name="%(base_delivery_carrier_label.action_carrier_account)d"
                                     icon="fa-arrow-right"
                                     type="action"
                                     string="GLS Carrier Account"