From a2a0007bf008e8ffe980572c2b707d82d0d28fe6 Mon Sep 17 00:00:00 2001 From: fshah Date: Fri, 29 Jan 2021 15:39:17 +0530 Subject: [PATCH] [14.0][MIG] report_qweb_pdf_watermark --- .travis.yml | 2 +- report_qweb_pdf_watermark/README.rst | 5 ++ report_qweb_pdf_watermark/__init__.py | 2 +- report_qweb_pdf_watermark/demo/report.xml | 54 ++++++++++--------- report_qweb_pdf_watermark/models/report.py | 11 ++-- .../readme/CONTRIBUTORS.rst | 1 + report_qweb_pdf_watermark/readme/HISTORY.rst | 12 +++++ .../tests/test_report_qweb_pdf_watermark.py | 2 +- 8 files changed, 57 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff612d45..d0499c6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - export WKHTMLTOPDF_VERSION=0.12.4 + - export WKHTMLTOPDF_VERSION=0.12.5 - travis_install_nightly script: diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst index 0201b08b..422882c6 100644 --- a/report_qweb_pdf_watermark/README.rst +++ b/report_qweb_pdf_watermark/README.rst @@ -67,6 +67,11 @@ Changelog * [MIG] Migration to V13. +14.0.1.0.0 (2021-01-29) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [MIG] Migration to V14. + Bug Tracker =========== diff --git a/report_qweb_pdf_watermark/__init__.py b/report_qweb_pdf_watermark/__init__.py index 4ecaf9b2..5c170507 100644 --- a/report_qweb_pdf_watermark/__init__.py +++ b/report_qweb_pdf_watermark/__init__.py @@ -1,4 +1,4 @@ # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import models # pyflakes.ignore +from . import models diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml index df7e944d..8c752c53 100644 --- a/report_qweb_pdf_watermark/demo/report.xml +++ b/report_qweb_pdf_watermark/demo/report.xml @@ -1,28 +1,34 @@ - - - docs[:1].company_id.logo - - + diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py index 8a98ca89..9362d13d 100644 --- a/report_qweb_pdf_watermark/models/report.py +++ b/report_qweb_pdf_watermark/models/report.py @@ -6,7 +6,8 @@ from logging import getLogger from PIL import Image -from odoo import api, fields, models, tools +from odoo import api, fields, models +from odoo.tools.safe_eval import safe_eval try: # we need this to be sure PIL has loaded PDF support @@ -34,12 +35,12 @@ class Report(models.Model): "You have access to variables `env` and `docs`", ) - def render_qweb_pdf(self, res_ids=None, data=None): + def _render_qweb_pdf(self, res_ids=None, data=None): if not self.env.context.get("res_ids"): - return super(Report, self.with_context(res_ids=res_ids)).render_qweb_pdf( + return super(Report, self.with_context(res_ids=res_ids))._render_qweb_pdf( res_ids=res_ids, data=data ) - return super(Report, self).render_qweb_pdf(res_ids=res_ids, data=data) + return super(Report, self)._render_qweb_pdf(res_ids=res_ids, data=data) @api.model def _run_wkhtmltopdf( @@ -65,7 +66,7 @@ class Report(models.Model): if self.pdf_watermark: watermark = b64decode(self.pdf_watermark) elif docids: - watermark = tools.safe_eval( + watermark = safe_eval( self.pdf_watermark_expression or "None", dict(env=self.env, docs=self.env[self.model].browse(docids)), ) diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst index e171dddc..475c9d68 100644 --- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst +++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Stefan Rijnhart * Rod Schouteden * Robin Goots +* Foram Shah diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst index 9917f688..23685406 100644 --- a/report_qweb_pdf_watermark/readme/HISTORY.rst +++ b/report_qweb_pdf_watermark/readme/HISTORY.rst @@ -2,3 +2,15 @@ ~~~~~~~~~~~~~~~~~~~~~~~ * [MIG] Migration to V12. + + +13.0.1.0.0 (2021-01-27) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [MIG] Migration to V13. + + +14.0.1.0.0 (2021-01-29) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [MIG] Migration to V14. diff --git a/report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py b/report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py index ce8645d2..0ad4beba 100644 --- a/report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py +++ b/report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py @@ -27,7 +27,7 @@ class TestReportQwebPdfWatermark(HttpCase): report = self.env["ir.model.data"].xmlid_to_object( "report_qweb_pdf_watermark.demo_report" ) - pdf, _ = report.with_context(force_report_rendering=True).render_qweb_pdf( + pdf, _ = report.with_context(force_report_rendering=True)._render_qweb_pdf( self.env["res.users"].search([]).ids ) self.assertEqual(pdf.count(b"/Subtype /Image"), number)