Merge PR #316 into 16.0

Signed-off-by pedrobaeza

.copier-answers.yml

@@ -1,10 +1,11 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.12.0
+_commit: v1.14.1
 _src_path: gh:oca/oca-addons-repo-template
 ci: GitHub
 dependency_installation_mode: PIP
 generate_requirements_txt: true
 github_check_license: true
+github_ci_extra_env: {}
 github_enable_codecov: true
 github_enable_makepot: true
 github_enable_stale_action: true

.github/workflows/pre-commit.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
               fi
           done
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     strategy:

.pre-commit-config.yaml

@@ -101,7 +101,7 @@ repos:
       - id: pyupgrade
         args: ["--keep-percent-format"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort except __init__.py

base_report_to_printer/models/ir_actions_report.py

@@ -157,16 +157,16 @@ class IrActionsReport(models.Model):
         generated document as well.
         """
         document, doc_format = super()._render_qweb_pdf(
-            report_ref=report_ref, res_ids=res_ids, data=data
+            report_ref, res_ids=res_ids, data=data
         )
-
-        behaviour = self.behaviour()
+        report = self._get_report(report_ref)
+        behaviour = report.behaviour()
         printer = behaviour.pop("printer", None)
-        can_print_report = self._can_print_report(behaviour, printer, document)
+        can_print_report = report._can_print_report(behaviour, printer, document)
 
         if can_print_report:
             printer.print_document(
-                self, document, doc_format=self.report_type, **behaviour
+                report, document, doc_format=report.report_type, **behaviour
             )
 
         return document, doc_format
@@ -180,14 +180,14 @@ class IrActionsReport(models.Model):
         document, doc_format = super()._render_qweb_text(
             report_ref, docids=docids, data=data
         )
-
-        behaviour = self.behaviour()
+        report = self._get_report(report_ref)
+        behaviour = report.behaviour()
         printer = behaviour.pop("printer", None)
-        can_print_report = self._can_print_report(behaviour, printer, document)
+        can_print_report = report._can_print_report(behaviour, printer, document)
 
         if can_print_report:
             printer.print_document(
-                self, document, doc_format=self.report_type, **behaviour
+                report, document, doc_format=report.report_type, **behaviour
             )
 
         return document, doc_format

base_report_to_printer/tests/test_report.py

@@ -18,7 +18,7 @@ class TestReport(common.HttpCase):
             "model": "ir.actions.report",
             "report_name": "Test Report",
         }
-        self.report_view = self.env["ir.ui.view"].create(
+        self.report_pdf_view = self.env["ir.ui.view"].create(
             {
                 "name": "Test",
                 "type": "qweb",
@@ -27,15 +27,36 @@ class TestReport(common.HttpCase):
             </t>""",
             }
         )
-        self.report_imd = (
+        self.report_pdf_imd = (
             self.env["ir.model.data"]
             .sudo()
             .create(
                 {
-                    "name": "test",
+                    "name": "test_pdf",
                     "module": "base_report_to_printer",
                     "model": "ir.ui.view",
-                    "res_id": self.report_view.id,
+                    "res_id": self.report_pdf_view.id,
+                }
+            )
+        )
+        self.report_text_view = self.env["ir.ui.view"].create(
+            {
+                "name": "Test",
+                "type": "qweb",
+                "arch": """<t t-name="base_report_to_printer.test_text">
+                Test
+                </t>""",
+            }
+        )
+        self.report_text_imd = (
+            self.env["ir.model.data"]
+            .sudo()
+            .create(
+                {
+                    "name": "test_text",
+                    "module": "base_report_to_printer",
+                    "model": "ir.ui.view",
+                    "res_id": self.report_text_view.id,
                 }
             )
         )
@@ -44,7 +65,7 @@ class TestReport(common.HttpCase):
                 "name": "Test",
                 "report_type": "qweb-pdf",
                 "model": "res.partner",
-                "report_name": "base_report_to_printer.test",
+                "report_name": "base_report_to_printer.test_pdf",
             }
         )
         self.report_text = self.Model.create(
@@ -52,7 +73,7 @@ class TestReport(common.HttpCase):
                 "name": "Test",
                 "report_type": "qweb-text",
                 "model": "res.partner",
-                "report_name": "base_report_to_printer.test",
+                "report_name": "base_report_to_printer.test_text",
             }
         )
         self.partners = self.env["res.partner"]
@@ -133,7 +154,7 @@ class TestReport(common.HttpCase):
             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(
-                self.report.report_name, self.partners.ids
+                self.report_text.report_name, self.partners.ids
             )
             print_document.assert_called_once_with(
                 self.report_text,