[MIG] printer_zpl2: Migration to 18.0

vvrossem · vvrossem · commit f79cc76c7d0f · 2025-02-19T09:37:50.000+01:00
diff --git a/printer_zpl2/__manifest__.py b/printer_zpl2/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Printer ZPL II",
-    "version": "16.0.1.1.0",
+    "version": "18.0.1.0.0",
     "category": "Printer",
     "summary": "Add a ZPL II label printing feature",
     "author": "SUBTENO-IT, FLorent de Labarre, "
diff --git a/printer_zpl2/models/printing_label_zpl2.py b/printer_zpl2/models/printing_label_zpl2.py
@@ -10,7 +10,7 @@
 import requests
 from PIL import Image, ImageOps
 
-from odoo import _, api, exceptions, fields, models
+from odoo import api, exceptions, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools.safe_eval import safe_eval, wrap_module
 
@@ -91,7 +91,7 @@ class PrintingLabelZpl2(models.Model):
     @api.constrains("component_ids")
     def check_recursion(self):
         cr = self._cr
-        self.flush(["component_ids"])
+        self.flush_recordset(["component_ids"])
         query = (
             'SELECT "{}", "{}" FROM "{}" '
             'WHERE "{}" IN %s AND "{}" IS NOT NULL'.format(
@@ -115,7 +115,9 @@ def check_recursion(self):
                     [id1] + list(preds[id1]), [id2] + list(succs[id2])
                 ):
                     if x == y:
-                        raise ValidationError(_("You can not create recursive labels."))
+                        raise ValidationError(
+                            self.env._("You can not create recursive labels.")
+                        )
                     succs[x].add(y)
                     preds[y].add(x)
                 if id2 not in done:
@@ -370,7 +372,9 @@ def print_label(self, printer, record, page_count=1, **extra):
         for label in self:
             if record._name != label.model_id.model:
                 raise exceptions.UserError(
-                    _("This label cannot be used on {model}").format(model=record._name)
+                    self.env._("This label cannot be used on {model}").format(
+                        model=record._name
+                    )
                 )
             # Send the label to printer
             label_contents = label._generate_zpl2_data(
@@ -385,7 +389,7 @@ def print_label(self, printer, record, page_count=1, **extra):
     def new_action(self, model_id):
         return self.env["ir.actions.act_window"].create(
             {
-                "name": _("Print Label"),
+                "name": self.env._("Print Label"),
                 "binding_model_id": model_id,
                 "res_model": "wizard.print.record.label",
                 "view_mode": "form",
@@ -522,9 +526,9 @@ def _generate_labelary_image(self):
                     return base64.b64encode(imgByteArr.getvalue())
                 else:
                     _logger.warning(
-                        _("Error with Labelary API. %s") % response.status_code
+                        self.env._("Error with Labelary API. %s") % response.status_code
                     )
 
             except Exception as e:
-                _logger.warning(_("Error with Labelary API. %s") % e)
+                _logger.warning(self.env._("Error with Labelary API. %s") % e)
         return False
diff --git a/printer_zpl2/tests/__init__.py b/printer_zpl2/tests/__init__.py
@@ -1,6 +1,7 @@
 # Copyright (C) 2016 SYLEAM (<http://www.syleam.fr>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from . import common
 from . import test_printing_label_zpl2
 from . import test_wizard_print_record_label
 from . import test_generate_action
diff --git a/printer_zpl2/tests/common.py b/printer_zpl2/tests/common.py
@@ -0,0 +1,30 @@
+from odoo.addons.base.tests.common import BaseCommon
+
+model = "odoo.addons.base_report_to_printer.models.printing_server"
+
+
+class PrinterZpl2Common(BaseCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.Model = cls.env["printing.label.zpl2"]
+        cls.ComponentModel = cls.env["printing.label.zpl2.component"]
+        cls.server = cls.env["printing.server"].create({})
+        cls.printer = cls.env["printing.printer"].create(
+            {
+                "name": "Printer",
+                "server_id": cls.server.id,
+                "system_name": "Sys Name",
+                "default": True,
+                "status": "unknown",
+                "status_message": "Msg",
+                "model": "res.users",
+                "location": "Location",
+                "uri": "URI",
+            }
+        )
+        cls.label_vals = {
+            "name": "ZPL II Label",
+            "model_id": cls.env.ref("base_report_to_printer.model_printing_printer").id,
+        }
+        cls.label = cls.env["printing.label.zpl2"].create(cls.label_vals)
diff --git a/printer_zpl2/tests/test_generate_action.py b/printer_zpl2/tests/test_generate_action.py
@@ -1,38 +1,12 @@
 # Copyright (C) 2018 Florent de Labarre (<https://github.com/fmdl>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo.tests.common import TransactionCase
+from .common import PrinterZpl2Common
 
 model = "odoo.addons.base_report_to_printer.models.printing_server"
 
 
-class TestWizardPrintRecordLabel(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["wizard.print.record.label"]
-        self.server = self.env["printing.server"].create({})
-        self.printer = self.env["printing.printer"].create(
-            {
-                "name": "Printer",
-                "server_id": self.server.id,
-                "system_name": "Sys Name",
-                "default": True,
-                "status": "unknown",
-                "status_message": "Msg",
-                "model": "res.users",
-                "location": "Location",
-                "uri": "URI",
-            }
-        )
-        self.label = self.env["printing.label.zpl2"].create(
-            {
-                "name": "ZPL II Label",
-                "model_id": self.env.ref(
-                    "base_report_to_printer.model_printing_printer"
-                ).id,
-            }
-        )
-
+class TestWizardPrintRecordLabel(PrinterZpl2Common):
     def test_create_action(self):
         """Check the creation of action"""
         self.label.create_action()
diff --git a/printer_zpl2/tests/test_printing_label_zpl2.py b/printer_zpl2/tests/test_printing_label_zpl2.py
@@ -4,39 +4,18 @@
 from unittest.mock import patch
 
 from odoo import exceptions
-from odoo.tests.common import TransactionCase
 
 from ..models import zpl2
+from .common import PrinterZpl2Common
 
 model = "odoo.addons.base_report_to_printer.models.printing_server"
 
 
-class TestPrintingLabelZpl2(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["printing.label.zpl2"]
-        self.ComponentModel = self.env["printing.label.zpl2.component"]
-        self.server = self.env["printing.server"].create({})
-        self.printer = self.env["printing.printer"].create(
-            {
-                "name": "Printer",
-                "server_id": self.server.id,
-                "system_name": "Sys Name",
-                "default": True,
-                "status": "unknown",
-                "status_message": "Msg",
-                "model": "res.users",
-                "location": "Location",
-                "uri": "URI",
-            }
-        )
-        self.label_vals = {
-            "name": "ZPL II Label",
-            "model_id": self.env.ref(
-                "base_report_to_printer.model_printing_printer"
-            ).id,
-        }
-        self.component_vals = {"name": "ZPL II Label Component"}
+class TestPrintingLabelZpl2(PrinterZpl2Common):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.component_vals = {"name": "ZPL II Label Component"}
 
     def new_label(self, vals=None):
         values = self.label_vals.copy()
diff --git a/printer_zpl2/tests/test_test_mode.py b/printer_zpl2/tests/test_test_mode.py
@@ -2,37 +2,25 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from unittest.mock import patch
 
-from odoo.tests.common import TransactionCase
+import requests
+
+from odoo.tools import mute_logger
+
+from .common import PrinterZpl2Common
 
 model = "odoo.addons.base_report_to_printer.models.printing_server"
 
 
-class TestWizardPrintRecordLabel(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["wizard.print.record.label"]
-        self.server = self.env["printing.server"].create({})
-        self.printer = self.env["printing.printer"].create(
-            {
-                "name": "Printer",
-                "server_id": self.server.id,
-                "system_name": "Sys Name",
-                "default": True,
-                "status": "unknown",
-                "status_message": "Msg",
-                "model": "res.users",
-                "location": "Location",
-                "uri": "URI",
-            }
-        )
-        self.label = self.env["printing.label.zpl2"].create(
-            {
-                "name": "ZPL II Label",
-                "model_id": self.env.ref(
-                    "base_report_to_printer.model_printing_printer"
-                ).id,
-            }
-        )
+class TestWizardPrintRecordLabel(PrinterZpl2Common):
+    @classmethod
+    def setUpClass(cls):
+        cls._super_send = requests.Session.send
+        super().setUpClass()
+
+    @classmethod
+    def _request_handler(cls, s, r, /, **kw):
+        """Don't block external requests."""
+        return cls._super_send(s, r, **kw)
 
     def test_get_record(self):
         """Check if return a record"""
@@ -64,11 +52,15 @@ def test_emulation_with_bad_header(self):
         self.label.test_labelary_mode = True
         self.label.labelary_width = 80
         self.label.labelary_dpmm = "8dpmm"
+        # Maximum label size of 15 x 15 inches
         self.label.labelary_height = 10000000
         self.env["printing.label.zpl2.component"].create(
             {"name": "ZPL II Label", "label_id": self.label.id, "data": '"Test"'}
         )
-        self.assertFalse(self.label.labelary_image)
+        # do not log expected warning "Error with Labelary API. 400"
+        # "ERROR: Label height is larger than 15.0 inches"
+        with mute_logger("odoo.addons.printer_zpl2.models.printing_label_zpl2"):
+            self.assertFalse(self.label.labelary_image)
 
     def test_emulation_with_bad_data_compute(self):
         """Check if bad data compute"""
diff --git a/printer_zpl2/tests/test_wizard_import_zpl2.py b/printer_zpl2/tests/test_wizard_import_zpl2.py
@@ -1,36 +1,10 @@
 # Copyright (C) 2018 Florent de Labarre (<https://github.com/fmdl>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo.tests.common import TransactionCase
+from .common import PrinterZpl2Common
 
 
-class TestWizardImportZpl2(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["wizard.print.record.label"]
-        self.server = self.env["printing.server"].create({})
-        self.printer = self.env["printing.printer"].create(
-            {
-                "name": "Printer",
-                "server_id": self.server.id,
-                "system_name": "Sys Name",
-                "default": True,
-                "status": "unknown",
-                "status_message": "Msg",
-                "model": "res.users",
-                "location": "Location",
-                "uri": "URI",
-            }
-        )
-        self.label = self.env["printing.label.zpl2"].create(
-            {
-                "name": "ZPL II Label",
-                "model_id": self.env.ref(
-                    "base_report_to_printer.model_printing_printer"
-                ).id,
-            }
-        )
-
+class TestWizardImportZpl2(PrinterZpl2Common):
     def test_open_wizard(self):
         """open wizard from label"""
         res = self.label.import_zpl2()
diff --git a/printer_zpl2/tests/test_wizard_print_record_label.py b/printer_zpl2/tests/test_wizard_print_record_label.py
@@ -3,42 +3,21 @@
 
 from unittest.mock import patch
 
-from odoo.tests.common import TransactionCase
+from .common import PrinterZpl2Common
 
 model = "odoo.addons.base_report_to_printer.models.printing_server"
 
 
-class TestWizardPrintRecordLabel(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["wizard.print.record.label"]
-        self.server = self.env["printing.server"].create({})
-        self.printer = self.env["printing.printer"].create(
-            {
-                "name": "Printer",
-                "server_id": self.server.id,
-                "system_name": "Sys Name",
-                "default": True,
-                "status": "unknown",
-                "status_message": "Msg",
-                "model": "res.users",
-                "location": "Location",
-                "uri": "URI",
-            }
-        )
-        self.label = self.env["printing.label.zpl2"].create(
-            {
-                "name": "ZPL II Label",
-                "model_id": self.env.ref(
-                    "base_report_to_printer.model_printing_printer"
-                ).id,
-            }
-        )
+class TestWizardPrintRecordLabel(PrinterZpl2Common):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.Wizard = cls.env["wizard.print.record.label"]
 
     @patch(f"{model}.cups")
     def test_print_record_label(self, cups):
         """Check that printing a label using the generic wizard works"""
-        wizard_obj = self.Model.with_context(
+        wizard_obj = self.Wizard.with_context(
             active_model="printing.printer",
             active_id=self.printer.id,
             active_ids=[self.printer.id],
@@ -75,7 +54,7 @@ def test_wizard_multiple_printers_and_labels(self):
                 ).id,
             }
         )
-        wizard_obj = self.Model.with_context(
+        wizard_obj = self.Wizard.with_context(
             active_model="printing.printer",
             active_id=self.printer.id,
             active_ids=[self.printer.id],
@@ -94,7 +73,7 @@ def test_wizard_multiple_labels_but_on_different_models(self):
                 "model_id": self.env.ref("base.model_res_users").id,
             }
         )
-        wizard_obj = self.Model.with_context(
+        wizard_obj = self.Wizard.with_context(
             active_model="printing.printer",
             active_id=self.printer.id,
             active_ids=[self.printer.id],
diff --git a/printer_zpl2/views/printing_label_zpl2.xml b/printer_zpl2/views/printing_label_zpl2.xml
diff --git a/printer_zpl2/wizard/wizard_import_zpl2.py b/printer_zpl2/wizard/wizard_import_zpl2.py

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`{`
`5`	`5`	`"name": "Printer ZPL II",`
`6`		`- "version": "16.0.1.1.0",`
	`6`	`+ "version": "18.0.1.0.0",`
`7`	`7`	`"category": "Printer",`
`8`	`8`	`"summary": "Add a ZPL II label printing feature",`
`9`	`9`	`"author": "SUBTENO-IT, FLorent de Labarre, "`