From 5c77a2e440c85d2b255af27cf9a597cfc8465175 Mon Sep 17 00:00:00 2001 From: hda Date: Wed, 7 Dec 2022 09:33:25 +0100 Subject: [PATCH] [MIG] base_report_to_printer: Migration to 16.0 --- base_report_to_printer/__manifest__.py | 2 +- base_report_to_printer/models/ir_actions_report.py | 8 +++++--- base_report_to_printer/readme/CONTRIBUTORS.rst | 1 + base_report_to_printer/tests/test_printing_server.py | 2 +- base_report_to_printer/tests/test_report.py | 6 ++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/base_report_to_printer/__manifest__.py b/base_report_to_printer/__manifest__.py index 61af227..3162307 100644 --- a/base_report_to_printer/__manifest__.py +++ b/base_report_to_printer/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Report to printer", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Generic Modules/Base", "author": "Agile Business Group & Domsense, Pegueroles SCP, NaN," " LasLabs, Camptocamp, Odoo Community Association (OCA)," diff --git a/base_report_to_printer/models/ir_actions_report.py b/base_report_to_printer/models/ir_actions_report.py index 1878344..1f1d63f 100644 --- a/base_report_to_printer/models/ir_actions_report.py +++ b/base_report_to_printer/models/ir_actions_report.py @@ -101,7 +101,7 @@ class IrActionsReport(models.Model): """Print a document, do not return the document file""" document, doc_format = self.with_context( must_skip_send_to_printer=True - )._render_qweb_pdf(record_ids, data=data) + )._render_qweb_pdf(self.report_name, record_ids, data=data) behaviour = self.behaviour() printer = behaviour.pop("printer", None) @@ -141,13 +141,15 @@ class IrActionsReport(models.Model): res["id"] = self.id return res - def _render_qweb_pdf(self, res_ids=None, data=None): + def _render_qweb_pdf(self, report_ref, res_ids=None, data=None): """Generate a PDF and returns it. If the action configured on the report is server, it prints the generated document as well. """ - document, doc_format = super()._render_qweb_pdf(res_ids=res_ids, data=data) + document, doc_format = super()._render_qweb_pdf( + report_ref=report_ref, res_ids=res_ids, data=data + ) behaviour = self.behaviour() printer = behaviour.pop("printer", None) diff --git a/base_report_to_printer/readme/CONTRIBUTORS.rst b/base_report_to_printer/readme/CONTRIBUTORS.rst index 7085b17..9fffa8e 100644 --- a/base_report_to_printer/readme/CONTRIBUTORS.rst +++ b/base_report_to_printer/readme/CONTRIBUTORS.rst @@ -12,3 +12,4 @@ * Rod Schouteden * Alexandre Fayolle * Matias Peralta +* Hughes Damry diff --git a/base_report_to_printer/tests/test_printing_server.py b/base_report_to_printer/tests/test_printing_server.py index eb289f8..1cecc12 100644 --- a/base_report_to_printer/tests/test_printing_server.py +++ b/base_report_to_printer/tests/test_printing_server.py @@ -95,7 +95,7 @@ class TestPrintingServer(TransactionCase): """It should update status even if printer is archived""" rec_id = self.new_printer() rec_id.toggle_active() - self.server.refresh() + self.server.invalidate_model() cups.Connection().getPrinters().get.return_value = False self.Model.action_update_printers() self.assertEqual( diff --git a/base_report_to_printer/tests/test_report.py b/base_report_to_printer/tests/test_report.py index 72ad9c5..2ef9db5 100644 --- a/base_report_to_printer/tests/test_report.py +++ b/base_report_to_printer/tests/test_report.py @@ -92,7 +92,7 @@ class TestReport(common.HttpCase): "printing_printer.PrintingPrinter." "print_document" ) as print_document: - self.report._render_qweb_pdf(self.partners.ids) + self.report._render_qweb_pdf(self.report.report_name, self.partners.ids) print_document.assert_not_called() def test_render_qweb_pdf_printable(self): @@ -104,7 +104,9 @@ class TestReport(common.HttpCase): ) as print_document: self.report.property_printing_action_id.action_type = "server" self.report.printing_printer_id = self.new_printer() - document = self.report._render_qweb_pdf(self.partners.ids) + document = self.report._render_qweb_pdf( + self.report.report_name, self.partners.ids + ) print_document.assert_called_once_with( self.report, document[0],