[MIG] delivery_carrier_label_batch: Migration to 18.0

Author: yankinmax

delivery_carrier_label_batch/__manifest__.py

@@ -2,17 +2,28 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 {
     "name": "Carrier labels - Stock Batch Picking (link)",
-    "version": "14.0.1.1.1",
+    "version": "18.0.1.0.0",
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "maintainer": "Camptocamp",
     "category": "Carrier",
     "complexity": "normal",
-    "depends": ["base_delivery_carrier_label", "stock_picking_batch_extended"],
+    "depends": [
+        # OCA/delivery-carrier
+        "delivery_carrier_option",
+        "delivery_carrier_shipping_label",
+        "delivery_postlogistics",
+        # OCA/stock-logistics-workflow
+        "stock_picking_batch_extended",
+    ],
     "website": "https://github.com/OCA/delivery-carrier",
     "data": [
+        # Security
+        "security/ir.model.access.csv",
+        # Data
         "data/ir.config_parameter.xml",
+        # Views
         "views/stock_batch_picking.xml",
-        "security/ir.model.access.csv",
+        # Wizard
         "wizard/generate_labels_view.xml",
         "wizard/apply_carrier_view.xml",
     ],

delivery_carrier_label_batch/data/ir.config_parameter.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo noupdate="1">
-    <record id="zpl2_assembler_single_images" model="ir.config_parameter">
+    <record
+        forcecreate="True"
+        id="zpl2_assembler_single_images"
+        model="ir.config_parameter"
+    >
         <field name="key">zpl2.assembler.single.images</field>
         <field name="value">False</field>
     </record>
-    <record id="zpl2_batch_merge" model="ir.config_parameter">
+    <record forcecreate="True" id="zpl2_batch_merge" model="ir.config_parameter">
         <field name="key">zpl2.batch.merge</field>
         <field name="value">False</field>
     </record>

delivery_carrier_label_batch/models/stock_batch_picking.py

@@ -1,6 +1,7 @@
 # Copyright 2013-2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-from odoo import _, api, fields, models
+from odoo import Command, api, fields, models
+from odoo.exceptions import UserError
 
 
 class StockBatchPicking(models.Model):
@@ -13,9 +14,24 @@ class StockBatchPicking(models.Model):
     _inherit = "stock.picking.batch"
 
     carrier_id = fields.Many2one(
-        "delivery.carrier", "Carrier", states={"done": [("readonly", True)]}
+        comodel_name="delivery.carrier",
     )
-    option_ids = fields.Many2many("delivery.carrier.option", string="Options")
+    option_ids = fields.Many2many(
+        comodel_name="delivery.carrier.option",
+    )
+    option_ids_domain = fields.Binary(
+        string="Options domain",
+        help="Dynamic domain used for the carrier options",
+        compute="_compute_option_ids_domain",
+    )
+
+    @api.depends("carrier_id")
+    def _compute_option_ids_domain(self):
+        for rec in self:
+            options_domain = None
+            if available_options := self.carrier_id.available_option_ids:
+                options_domain = [("id", "in", available_options.ids)]
+            rec.option_ids_domain = options_domain
 
     def action_set_options(self):
         """Apply options to picking of the batch
@@ -26,7 +42,7 @@ def action_set_options(self):
         for rec in self:
             options_datas = {
                 "carrier_id": rec.carrier_id.id,
-                "option_ids": [(6, 0, rec.option_ids.ids)],
+                "option_ids": [Command.set(rec.option_ids.ids)],
             }
             rec.picking_ids.write(options_datas)
 
@@ -36,38 +52,29 @@ def _get_options_to_add(self, carrier=None):
         return options.filtered(lambda rec: rec.mandatory or rec.by_default)
 
     @api.onchange("carrier_id")
-    def carrier_id_change(self):
+    def onchange_carrier_id(self):
         """Inherit this method in your module"""
-        if self.carrier_id:
-            available_options = self.carrier_id.available_option_ids
-            default_options = self._get_options_to_add()
-            self.option_ids = [(6, 0, default_options.ids)]
-            self.carrier_code = self.carrier_id.code
-            return {
-                "domain": {
-                    "option_ids": [("id", "in", available_options.ids)],
-                }
-            }
-        return {}
+        if not self.carrier_id:
+            return
+        default_options = self._get_options_to_add()
+        self.option_ids = [Command.set(default_options.ids)]
+        self.carrier_code = self.carrier_id.code
 
     @api.onchange("option_ids")
-    def option_ids_change(self):
-        res = {}
+    def onchange_option_ids(self):
         if not self.carrier_id:
-            return res
+            return
+
         for available_option in self.carrier_id.available_option_ids:
             if available_option.mandatory and available_option not in self.option_ids:
-                res["warning"] = {
-                    "title": _("User Error !"),
-                    "message": _(
-                        "You can not remove a mandatory option."
+                # Optionally, reset the options to the default values.
+                self.option_ids = self._get_options_to_add()
+                raise UserError(
+                    self.env._(
+                        "You cannot remove a mandatory option. "
                         "\nPlease reset options to default."
-                    ),
-                }
-                # Due to https://github.com/odoo/odoo/issues/2693 we cannot
-                # reset options
-                # self.option_ids = self._get_options_to_add()
-        return res
+                    )
+                )
 
     def _values_with_carrier_options(self, values):
         values = values.copy()
@@ -77,7 +84,7 @@ def _values_with_carrier_options(self, values):
             carrier = self.env["delivery.carrier"].browse(carrier_id)
             options = self._get_options_to_add(carrier)
             if options:
-                values.update(option_ids=[(6, 0, options.ids)])
+                values.update(option_ids=[Command.set(options.ids)])
         return values
 
     def write(self, values):
@@ -93,16 +100,17 @@ def write(self, values):
             self.purge_tracking_references()
         return result
 
-    @api.model
-    def create(self, values):
+    @api.model_create_multi
+    def create(self, vals_list):
         """Set the default options when the delivery method is set on creation
 
         So we are sure that the options are always in line with the
         current delivery method.
 
         """
-        values = self._values_with_carrier_options(values)
-        return super().create(values)
+        for values in vals_list:
+            self._values_with_carrier_options(values)
+        return super().create(vals_list)
 
     def purge_tracking_references(self):
         """Purge tracking for each picking and destination package"""

delivery_carrier_label_batch/tests/test_generate_labels.py

@@ -3,12 +3,13 @@
 import base64
 from unittest.mock import patch
 
-import odoo.tests.common as common
-from odoo import exceptions
+from odoo import Command, exceptions
 from odoo.modules import get_module_resource
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestGenerateLabels(common.SavepointCase):
+
+class TestGenerateLabels(BaseCommon):
     """Test the wizard for delivery carrier label generation"""
 
     @classmethod
@@ -25,10 +26,10 @@ def setUpClass(cls):
         cls.customer_location = cls.env.ref("stock.stock_location_customers")
 
         cls.productA = cls.env["product.product"].create(
-            {"name": "Product A", "type": "product"}
+            {"name": "Product A", "is_storable": True}
         )
         cls.productB = cls.env["product.product"].create(
-            {"name": "Product B", "type": "product"}
+            {"name": "Product B", "is_storable": True}
         )
         cls.env["stock.quant"]._update_available_quantity(
             cls.productA, cls.stock_location, 20.0
@@ -110,16 +111,19 @@ def setUpClass(cls):
         cls.batch = BatchPicking.create(
             {
                 "name": "demo_prep001",
-                "picking_ids": [(4, cls.picking_out_1.id), (4, cls.picking_out_2.id)],
+                "picking_ids": [
+                    Command.link(cls.picking_out_1.id),
+                    Command.link(cls.picking_out_2.id),
+                ],
                 "use_oca_batch_validation": True,
             }
         )
 
         cls.batch.action_confirm()
         cls.batch.action_assign()
 
-        move1.move_line_ids[0].qty_done = 2
-        move2.move_line_ids[0].qty_done = 2
+        move1.move_line_ids[0].write({"quantity": 2, "picked": True})
+        move2.move_line_ids[0].write({"quantity": 2, "picked": True})
 
         cls.picking_out_1._set_a_default_package()
         cls.picking_out_2._set_a_default_package()
@@ -151,7 +155,7 @@ def setUpClass(cls):
                 }
             )
 
-    def test_action_generate_labels(self):
+    def test_00_action_generate_labels(self):
         """Check merging of pdf labels
 
         Test pdf generation without multiple threading
@@ -172,20 +176,21 @@ def test_action_generate_labels(self):
         self.assertTrue(attachment.name, "demo_prep001.pdf")
         self.assertTrue(attachment.mimetype, "application/pdf")
 
-    def test_action_generate_labels_no_pack(self):
+    def test_01_action_generate_labels_no_pack(self):
         """Check merging of pdf labels
 
         It shouldn't be possible to print labels when packages are missing
         """
-        domain = [("picking_id", "in", self.batch.picking_ids.ids)]
-        self.env["stock.package_level"].search(domain).unlink()
+        self.batch.picking_ids.move_line_ids.write(
+            {"result_package_id": False, "package_id": False}
+        )
         wizard = self.DeliveryCarrierLabelGenerate.with_context(
             active_ids=self.batch.ids, active_model="stock.picking.batch"
         ).create({})
         with self.assertRaises(exceptions.UserError):
             wizard.action_generate_labels()
 
-    def test_action_regenerate_labels(self):
+    def test_02_action_regenerate_labels(self):
         """Check re-generating labels"""
         wizard = self.DeliveryCarrierLabelGenerate.with_context(
             active_ids=self.batch.ids, active_model="stock.picking.batch"
@@ -219,7 +224,7 @@ def test_action_regenerate_labels(self):
             self.assertEqual(self.picking_out_1.carrier_tracking_ref, "TEST00001")
             self.assertEqual(self.picking_out_2.carrier_tracking_ref, "TEST00001")
 
-    def test_batch_purge_tracking_reference(self):
+    def test_03_batch_purge_tracking_reference(self):
         """Unittest: check that tracking reference purge work as expected"""
         self.batch.purge_tracking_references()
         self.assertTrue(
@@ -233,7 +238,7 @@ def test_batch_purge_tracking_reference(self):
         pickings = [self.picking_out_1, self.picking_out_2]
         self.assertTrue(all([not p.carrier_tracking_ref for p in pickings]))
 
-    def test_action_change_carrier_purge_tracking_reference(self):
+    def test_04_action_change_carrier_purge_tracking_reference(self):
         """Functional: Check purge_tracking_reference is called as carrier is
         changed from wizard"""
         wizard = self.PickingBatchApplyCarrier.with_context(

delivery_carrier_label_batch/views/stock_batch_picking.xml

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <record model="ir.ui.view" id="stock_batch_picking_form">
+    <record model="ir.ui.view" id="stock_picking_batch_form">
         <field name="name">stock.picking.batch.form</field>
         <field name="model">stock.picking.batch</field>
         <field
             name="inherit_id"
-            ref="stock_picking_batch_extended.stock_batch_picking_form"
+            ref="stock_picking_batch_extended.stock_picking_batch_form"
         />
         <field name="arch" type="xml">
             <notebook position="inside">
                 <page name="carrier" string="Carrier Info">
                     <separator string="Delivery" />
                     <group>
-                        <field name="carrier_id" />
+                        <field name="carrier_id" readonly="state == 'done'" />
                     </group>
                     <separator string="Options" />
-                    <field name="option_ids" nolabel="1" />
+                    <field name="option_ids_domain" invisible="1" />
+                    <field name="option_ids" nolabel="1" domain="option_ids_domain" />
                     <label
                         for="action_set_options"
                         string="Warning, setting options will erase the existing ones in delivery orders"