Merge PR #950 into 16.0

Signed-off-by hbrunn
OCA · Nov 27, 2024 · 115bbb0 · 115bbb0
2 parents 428dbe7 + 210c266
commit 115bbb0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
@@ -132,6 +132,7 @@ Contributors
 * Foram Shah <[email protected]>
 * Emiel van Bokhoven <[email protected]>
 * Anjeel Haria
+* Hugo Martínez <[email protected]>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
@@ -62,27 +62,7 @@ def pdf_has_usable_pages(self, numpages):
             )
         return True
 
-    @api.model
-    def _run_wkhtmltopdf(
-        self,
-        bodies,
-        report_ref=False,
-        header=None,
-        footer=None,
-        landscape=False,
-        specific_paperformat_args=None,
-        set_viewport_size=False,
-    ):
-        result = super(Report, self)._run_wkhtmltopdf(
-            bodies,
-            report_ref=report_ref,
-            header=header,
-            footer=footer,
-            landscape=landscape,
-            specific_paperformat_args=specific_paperformat_args,
-            set_viewport_size=set_viewport_size,
-        )
-
+    def _get_watermark(self, report_ref):
         docids = self.env.context.get("res_ids", False)
         report_sudo = self._get_report(report_ref)
         watermark = None
@@ -105,6 +85,30 @@ def _run_wkhtmltopdf(
             if watermark:
                 watermark = b64decode(watermark)
 
+        return watermark
+
+    @api.model
+    def _run_wkhtmltopdf(
+        self,
+        bodies,
+        report_ref=False,
+        header=None,
+        footer=None,
+        landscape=False,
+        specific_paperformat_args=None,
+        set_viewport_size=False,
+    ):
+        result = super(Report, self)._run_wkhtmltopdf(
+            bodies,
+            report_ref=report_ref,
+            header=header,
+            footer=footer,
+            landscape=landscape,
+            specific_paperformat_args=specific_paperformat_args,
+            set_viewport_size=set_viewport_size,
+        )
+        watermark = self._get_watermark(report_ref)
+
         if not watermark:
             return result
 

diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
@@ -5,3 +5,4 @@
 * Foram Shah <[email protected]>
 * Emiel van Bokhoven <[email protected]>
 * Anjeel Haria
+* Hugo Martínez <[email protected]>
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -489,12 +489,15 @@ <h2><a class="toc-backref" href="#toc-entry-13">Contributors</a></h2>
 <li>Foram Shah &lt;<a class="reference external" href="mailto:foram.shah&#64;initos.com">foram.shah&#64;initos.com</a>&gt;</li>
 <li>Emiel van Bokhoven &lt;<a class="reference external" href="mailto:emiel&#64;360erp.nl">emiel&#64;360erp.nl</a>&gt;</li>
 <li>Anjeel Haria</li>
+<li>Hugo Martínez &lt;<a class="reference external" href="mailto:hugo.martinez&#64;netkia.es">hugo.martinez&#64;netkia.es</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-14">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>