From 26d4a16f09a11ae936be1e98c7b3d578ff62ebd8 Mon Sep 17 00:00:00 2001
From: David Montull <david.montull@bt-group.com>
Date: Fri, 4 Mar 2022 13:52:14 +0100
Subject: [PATCH] [15.0][MIG] base_report_to_printer: Migration to 15.0

---
 base_report_to_printer/__manifest__.py         |  8 ++++++--
 .../models/printing_server.py                  |  9 ++++++---
 base_report_to_printer/tests/test_report.py    | 18 +++++++++++-------
 base_report_to_printer/views/assets.xml        | 15 ---------------
 4 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 base_report_to_printer/views/assets.xml

diff --git a/base_report_to_printer/__manifest__.py b/base_report_to_printer/__manifest__.py
index 3062901..be287f1 100644
--- a/base_report_to_printer/__manifest__.py
+++ b/base_report_to_printer/__manifest__.py
@@ -7,7 +7,7 @@
 
 {
     "name": "Report to printer",
-    "version": "14.0.2.0.0",
+    "version": "15.0.1.0.0",
     "category": "Generic Modules/Base",
     "author": "Agile Business Group & Domsense, Pegueroles SCP, NaN,"
     " LasLabs, Camptocamp, Odoo Community Association (OCA),"
@@ -18,7 +18,6 @@
     "data": [
         "data/printing_data.xml",
         "security/security.xml",
-        "views/assets.xml",
         "views/printing_printer.xml",
         "views/printing_server.xml",
         "views/printing_job.xml",
@@ -27,6 +26,11 @@
         "views/ir_actions_report.xml",
         "wizards/printing_printer_update_wizard_view.xml",
     ],
+    "assets": {
+        "web.assets_backend": [
+            "/base_report_to_printer/static/src/js/qweb_action_manager.js",
+        ],
+    },
     "installable": True,
     "application": False,
     "external_dependencies": {"python": ["pycups"]},
diff --git a/base_report_to_printer/models/printing_server.py b/base_report_to_printer/models/printing_server.py
index 9314f4b..06de8fa 100644
--- a/base_report_to_printer/models/printing_server.py
+++ b/base_report_to_printer/models/printing_server.py
@@ -71,13 +71,16 @@ class PrintingServer(models.Model):
             connection = cups.Connection(host=self.address, port=self.port)
         except Exception:
             message = _(
-                "Failed to connect to the CUPS server on %s:%s. "
+                "Failed to connect to the CUPS server on %(address)s:%(port)s. "
                 "Check that the CUPS server is running and that "
                 "you can reach it from the Odoo server."
-            ) % (self.address, self.port)
+            ) % {
+                "address": self.address,
+                "port": self.port,
+            }
             _logger.warning(message)
             if raise_on_error:
-                raise exceptions.UserError(message)
+                raise exceptions.UserError(message) from Exception
 
         return connection
 
diff --git a/base_report_to_printer/tests/test_report.py b/base_report_to_printer/tests/test_report.py
index 876d5f1..72ad9c5 100644
--- a/base_report_to_printer/tests/test_report.py
+++ b/base_report_to_printer/tests/test_report.py
@@ -27,13 +27,17 @@ class TestReport(common.HttpCase):
             </t>""",
             }
         )
-        self.report_imd = self.env["ir.model.data"].create(
-            {
-                "name": "test",
-                "module": "base_report_to_printer",
-                "model": "ir.ui.view",
-                "res_id": self.report_view.id,
-            }
+        self.report_imd = (
+            self.env["ir.model.data"]
+            .sudo()
+            .create(
+                {
+                    "name": "test",
+                    "module": "base_report_to_printer",
+                    "model": "ir.ui.view",
+                    "res_id": self.report_view.id,
+                }
+            )
         )
         self.report = self.Model.create(
             {
diff --git a/base_report_to_printer/views/assets.xml b/base_report_to_printer/views/assets.xml
deleted file mode 100644
index 6c60b41..0000000
--- a/base_report_to_printer/views/assets.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <template
-        id="assets_backend"
-        name="base_report_to_printer assets"
-        inherit_id="web.assets_backend"
-    >
-        <xpath expr="." position="inside">
-            <script
-                type="text/javascript"
-                src="/base_report_to_printer/static/src/js/qweb_action_manager.js"
-            />
-        </xpath>
-    </template>
-</odoo>