odoo-addon-base-report-to-printer 17.0.1.1.1__py3-none-any.whl → 18.0.1.0.0.2__py3-none-any.whl

odoo/addons/base_report_to_printer/tests/test_printing_printer_tray.py

@@ -99,7 +99,7 @@ class TestPrintingPrinter(TransactionCase):
             }
         }
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_update_printers(self, cups):
         """
         Check that the update_printers method calls _prepare_update_from_cups
@@ -111,7 +111,7 @@ class TestPrintingPrinter(TransactionCase):
         self.ServerModel.update_printers()
         self.assertEqual(self.printer.name, "My custom name")
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups_no_ppd(self, cups):
         """
         Check that the tray_ids field has no value when no PPD is available
@@ -124,7 +124,7 @@ class TestPrintingPrinter(TransactionCase):
         vals = self.printer._prepare_update_from_cups(connection, cups_printer)
         self.assertFalse("tray_ids" in vals)
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups_empty_ppd(self, cups):
         """
         Check that the tray_ids field has no value when the PPD file has
@@ -142,7 +142,7 @@ class TestPrintingPrinter(TransactionCase):
         vals = self.printer._prepare_update_from_cups(connection, cups_printer)
         self.assertFalse("tray_ids" in vals)
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     @mock.patch("os.unlink")
     def test_prepare_update_from_cups_unlink_error(self, os_unlink, cups):
         """
@@ -159,7 +159,7 @@ class TestPrintingPrinter(TransactionCase):
         with self.assertRaises(OSError):
             self.printer._prepare_update_from_cups(connection, cups_printer)
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     @mock.patch("os.unlink")
     def test_prepare_update_from_cups_unlink_error_enoent(self, os_unlink, cups):
         """
@@ -181,7 +181,7 @@ class TestPrintingPrinter(TransactionCase):
             [(0, 0, {"name": "Auto (Default)", "system_name": "Auto"})],
         )
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups(self, cups):
         """
         Check the return value when adding a single tray
@@ -197,7 +197,7 @@ class TestPrintingPrinter(TransactionCase):
             [(0, 0, {"name": "Auto (Default)", "system_name": "Auto"})],
         )
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups_with_multiple_trays(self, cups):
         """
         Check the return value when adding multiple trays at once
@@ -216,7 +216,7 @@ class TestPrintingPrinter(TransactionCase):
             ],
         )
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups_already_known_trays(self, cups):
         """
         Check that calling the method twice doesn't create the trays multiple
@@ -236,7 +236,7 @@ class TestPrintingPrinter(TransactionCase):
             [(0, 0, {"name": "Auto (Default)", "system_name": "Auto"})],
         )
 
-    @mock.patch("%s.cups" % server_model)
+    @mock.patch(f"{server_model}.cups")
     def test_prepare_update_from_cups_unknown_trays(self, cups):
         """
         Check that trays which are not in the PPD file are removed from Odoo

odoo/addons/base_report_to_printer/tests/test_printing_printer_wizard.py

@@ -1,6 +1,7 @@
 # Copyright 2016 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import logging
 from unittest import mock
 
 from odoo.exceptions import UserError
@@ -36,7 +37,7 @@ class TestPrintingPrinterWizard(TransactionCase):
             "uri": self.printer_vals["device-uri"],
         }
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_action_ok_inits_connection(self, cups):
         """It should initialize CUPS connection"""
         self.Model.action_ok()
@@ -44,7 +45,7 @@ class TestPrintingPrinterWizard(TransactionCase):
             host=self.server.address, port=self.server.port
         )
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_action_ok_gets_printers(self, cups):
         """It should get printers from CUPS"""
         cups.Connection().getPrinters.return_value = {"sys_name": self.printer_vals}
@@ -52,14 +53,19 @@ class TestPrintingPrinterWizard(TransactionCase):
         self.Model.action_ok()
         cups.Connection().getPrinters.assert_called_once_with()
 
-    @mock.patch("%s.cups" % model)
-    def test_action_ok_raises_warning_on_error(self, cups):
+    def test_action_ok_raises_warning_on_error(self):
         """It should raise Warning on any error"""
-        cups.Connection.side_effect = StopTest
-        with self.assertRaises(UserError):
-            self.Model.action_ok()
+        with (
+            mock.patch(f"{model}.cups") as cups,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
+            cups.Connection.side_effect = StopTest
+            with self.assertRaises(UserError):
+                self.Model.action_ok()
+            self.assertEqual(len(logs.records), 1)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_action_ok_creates_new_printer(self, cups):
         """It should create new printer w/ proper vals"""
         cups.Connection().getPrinters.return_value = {"sys_name": self.printer_vals}
@@ -75,7 +81,7 @@ class TestPrintingPrinterWizard(TransactionCase):
 
             self.assertEqual(val, rec_id[key])
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_action_ok_skips_existing_printer(self, cups):
         """It should not recreate existing printers"""
         cups.Connection().getPrinters.return_value = {"sys_name": self.printer_vals}

odoo/addons/base_report_to_printer/tests/test_printing_server.py

@@ -1,6 +1,7 @@
 # Copyright 2016 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import logging
 from unittest import mock
 
 from odoo import fields
@@ -43,15 +44,20 @@ class TestPrintingServer(TransactionCase):
         values["printer_id"] = printer.id
         return self.env["printing.job"].create(values)
 
-    @mock.patch("%s.cups" % model)
-    def test_update_printers_error(self, cups):
+    def test_update_printers_error(self):
         """It should catch any exception from CUPS and update status"""
-        cups.Connection.side_effect = Exception
-        rec_id = self.new_printer()
-        self.Model.update_printers()
-        self.assertEqual("server-error", rec_id.status)
+        with (
+            mock.patch(f"{model}.cups") as cups,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
+            cups.Connection.side_effect = Exception
+            rec_id = self.new_printer()
+            self.Model.update_printers()
+            self.assertEqual("server-error", rec_id.status)
+            self.assertEqual(len(logs.records), 1)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_printers_inits_cups(self, cups):
         """It should init CUPS connection"""
         self.new_printer()
@@ -60,29 +66,29 @@ class TestPrintingServer(TransactionCase):
             host=self.server.address, port=self.server.port
         )
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_printers_gets_all_printers(self, cups):
         """It should get all printers from CUPS server"""
         self.new_printer()
         self.Model.update_printers()
         cups.Connection().getPrinters.assert_called_once_with()
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_printers_search(self, cups):
         """It should search all when no domain"""
-        with mock.patch("%s.search" % model_base) as search:
+        with mock.patch(f"{model_base}.search") as search:
             self.Model.update_printers()
             search.assert_called_once_with([])
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_printers_search_domain(self, cups):
         """It should use specific domain for search"""
-        with mock.patch("%s.search" % model_base) as search:
+        with mock.patch(f"{model_base}.search") as search:
             expect = [("id", ">", 0)]
             self.Model.update_printers(expect)
             search.assert_called_once_with(expect)
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_printers_update_unavailable(self, cups):
         """It should update status when printer is unavailable"""
         rec_id = self.new_printer()
@@ -90,7 +96,7 @@ class TestPrintingServer(TransactionCase):
         self.Model.action_update_printers()
         self.assertEqual("unavailable", rec_id.status)
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_archived_printers(self, cups):
         """It should update status even if printer is archived"""
         rec_id = self.new_printer()
@@ -103,7 +109,7 @@ class TestPrintingServer(TransactionCase):
             rec_id.status,
         )
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_jobs_cron(self, cups):
         """It should get all jobs from CUPS server"""
         self.new_printer()
@@ -125,7 +131,7 @@ class TestPrintingServer(TransactionCase):
             ],
         )
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_jobs_button(self, cups):
         """It should get all jobs from CUPS server"""
         self.new_printer()
@@ -147,17 +153,22 @@ class TestPrintingServer(TransactionCase):
             ],
         )
 
-    @mock.patch("%s.cups" % model)
-    def test_update_jobs_error(self, cups):
+    def test_update_jobs_error(self):
         """It should catch any exception from CUPS and update status"""
-        cups.Connection.side_effect = Exception
-        self.new_printer()
-        self.server.update_jobs()
-        cups.Connection.assert_called_with(
-            host=self.server.address, port=self.server.port
-        )
-
-    @mock.patch("%s.cups" % model)
+        with (
+            mock.patch(f"{model}.cups") as cups,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
+            cups.Connection.side_effect = Exception
+            self.new_printer()
+            self.server.update_jobs()
+            cups.Connection.assert_called_with(
+                host=self.server.address, port=self.server.port
+            )
+            self.assertEqual(len(logs.records), 2)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
+
+    @mock.patch(f"{model}.cups")
     def test_update_jobs_uncompleted(self, cups):
         """
         It should search which jobs have been completed since last update
@@ -182,7 +193,7 @@ class TestPrintingServer(TransactionCase):
             ],
         )
 
-    @mock.patch("%s.cups" % model)
+    @mock.patch(f"{model}.cups")
     def test_update_jobs(self, cups):
         """
         It should update all jobs, known or not

odoo/addons/base_report_to_printer/tests/test_report.py

@@ -2,6 +2,7 @@
 # Copyright 2017 Tecnativa - Jairo Llopis
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import logging
 from unittest import mock
 
 from odoo import exceptions
@@ -128,11 +129,14 @@ class TestReport(common.HttpCase):
 
     def test_render_qweb_pdf_printable(self):
         """It should print the report, only if it is printable"""
-        with mock.patch(
-            "odoo.addons.base_report_to_printer.models."
-            "printing_printer.PrintingPrinter."
-            "print_document"
-        ) as print_document:
+        with (
+            mock.patch(
+                "odoo.addons.base_report_to_printer.models."
+                "printing_printer.PrintingPrinter."
+                "print_document"
+            ) as print_document,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
             self.report.property_printing_action_id.action_type = "server"
             self.report.printing_printer_id = self.new_printer()
             document = self.report._render_qweb_pdf(
@@ -145,14 +149,19 @@ class TestReport(common.HttpCase):
                 doc_format="qweb-pdf",
                 tray=False,
             )
+            self.assertEqual(len(logs.records), 1)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
     def test_render_qweb_text_printable(self):
         """It should print the report, only if it is printable"""
-        with mock.patch(
-            "odoo.addons.base_report_to_printer.models."
-            "printing_printer.PrintingPrinter."
-            "print_document"
-        ) as print_document:
+        with (
+            mock.patch(
+                "odoo.addons.base_report_to_printer.models."
+                "printing_printer.PrintingPrinter."
+                "print_document"
+            ) as print_document,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
             self.report_text.property_printing_action_id.action_type = "server"
             self.report_text.printing_printer_id = self.new_printer()
             document = self.report_text._render_qweb_text(
@@ -165,29 +174,41 @@ class TestReport(common.HttpCase):
                 doc_format="qweb-text",
                 tray=False,
             )
+            self.assertEqual(len(logs.records), 1)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
     def test_print_document_not_printable(self):
         """It should print the report, regardless of the defined behaviour"""
         self.report.printing_printer_id = self.new_printer()
-        with mock.patch(
-            "odoo.addons.base_report_to_printer.models."
-            "printing_printer.PrintingPrinter."
-            "print_document"
-        ) as print_document:
+        with (
+            mock.patch(
+                "odoo.addons.base_report_to_printer.models."
+                "printing_printer.PrintingPrinter."
+                "print_document"
+            ) as print_document,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
             self.report.print_document(self.partners.ids)
             print_document.assert_called_once()
+            self.assertEqual(len(logs.records), 2)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
     def test_print_document_printable(self):
         """It should print the report, regardless of the defined behaviour"""
         self.report.property_printing_action_id.action_type = "server"
         self.report.printing_printer_id = self.new_printer()
-        with mock.patch(
-            "odoo.addons.base_report_to_printer.models."
-            "printing_printer.PrintingPrinter."
-            "print_document"
-        ) as print_document:
+        with (
+            mock.patch(
+                "odoo.addons.base_report_to_printer.models."
+                "printing_printer.PrintingPrinter."
+                "print_document"
+            ) as print_document,
+            self.assertLogs(level=logging.WARNING) as logs,
+        ):
             self.report.print_document(self.partners.ids)
             print_document.assert_called_once()
+            self.assertEqual(len(logs.records), 2)
+            self.assertEqual(logs.records[0].levelno, logging.WARNING)
 
     def test_print_document_no_printer(self):
         """It should raise an error"""

odoo/addons/base_report_to_printer/views/printing_job.xml

@@ -36,11 +36,11 @@
         <field name="name">printing.job.tree (in base_report_to_printer)</field>
         <field name="model">printing.job</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="job_id_cups" />
                 <field name="job_state" />
-            </tree>
+            </list>
         </field>
     </record>
 </odoo>

odoo/addons/base_report_to_printer/views/printing_printer.xml

@@ -101,7 +101,7 @@
         <field name="name">printing.printer.tree (in base_report_to_printer)</field>
         <field name="model">printing.printer</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-success="status=='available'"
                 decoration-warning="status=='printing'"
                 decoration-danger="status not in ['printing', 'available']"
@@ -111,7 +111,7 @@
                 <field name="system_name" />
                 <field name="server_id" />
                 <field name="status" />
-            </tree>
+            </list>
         </field>
     </record>
     <record model="ir.ui.view" id="printing_printer_view_search">
@@ -135,7 +135,7 @@
         <field name="name">Show Printers</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">printing.printer</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem
         name="Printers"

odoo/addons/base_report_to_printer/views/printing_report.xml

@@ -21,12 +21,12 @@
         >printing.report.xml.action.tree (in base_report_to_printer)</field>
         <field name="model">printing.report.xml.action</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="user_id" />
                 <field name="action" />
                 <field name="printer_id" />
                 <field name="printer_tray_id" />
-            </tree>
+            </list>
         </field>
     </record>
     <!-- Add a shorcut to "Actions/Report" in the Printing menu -->

odoo/addons/base_report_to_printer/views/printing_server.xml

@@ -45,11 +45,11 @@
         <field name="name">printing.server.tree (in base_report_to_printer)</field>
         <field name="model">printing.server</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="address" />
                 <field name="port" />
-            </tree>
+            </list>
         </field>
     </record>
     <record model="ir.ui.view" id="printing_server_view_search">
@@ -67,7 +67,7 @@
         <field name="name">Servers</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">printing.server</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem
         name="Servers"

odoo/addons/base_report_to_printer/wizards/print_attachment_report.xml

@@ -8,11 +8,11 @@
                 <group>
                     <field name="printer_id" />
                     <field name="attachment_line_ids">
-                        <tree editable="top">
+                        <list editable="top">
                             <field name="attachment_id" create="0" />
                             <field name="record_name" />
                             <field name="copies" />
-                        </tree>
+                        </list>
                     </field>
                 </group>
                 <footer>

odoo/addons/base_report_to_printer/wizards/printing_printer_update_wizard.py

@@ -20,7 +20,7 @@ class PrintingPrinterUpdateWizard(models.TransientModel):
 
         return {
             "name": "Printers",
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "res_model": "printing.printer",
             "type": "ir.actions.act_window",
             "target": "current",