From 0e9563343e48333c79bdcedf1295decd027d2bd9 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 9 Jan 2017 21:48:17 +0100
Subject: [PATCH 01/42] report_qweb_pdf_watermark (#86)

---
 report_qweb_pdf_watermark/README.rst          |  62 +++++++++++++
 report_qweb_pdf_watermark/__init__.py         |   4 +
 report_qweb_pdf_watermark/__openerp__.py      |  18 ++++
 report_qweb_pdf_watermark/demo/report.xml     |  30 ++++++
 report_qweb_pdf_watermark/models/__init__.py  |   5 +
 .../models/ir_actions_report_xml.py           |  14 +++
 report_qweb_pdf_watermark/models/report.py    |  87 ++++++++++++++++++
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 report_qweb_pdf_watermark/tests/__init__.py   |   4 +
 .../tests/test_report_qweb_pdf_watermark.py   |  32 +++++++
 .../views/ir_actions_report_xml.xml           |  15 +++
 11 files changed, 271 insertions(+)
 create mode 100644 report_qweb_pdf_watermark/README.rst
 create mode 100644 report_qweb_pdf_watermark/__init__.py
 create mode 100644 report_qweb_pdf_watermark/__openerp__.py
 create mode 100644 report_qweb_pdf_watermark/demo/report.xml
 create mode 100644 report_qweb_pdf_watermark/models/__init__.py
 create mode 100644 report_qweb_pdf_watermark/models/ir_actions_report_xml.py
 create mode 100644 report_qweb_pdf_watermark/models/report.py
 create mode 100644 report_qweb_pdf_watermark/static/description/icon.png
 create mode 100644 report_qweb_pdf_watermark/tests/__init__.py
 create mode 100644 report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py
 create mode 100644 report_qweb_pdf_watermark/views/ir_actions_report_xml.xml

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
new file mode 100644
index 0000000000..35c63a0504
--- /dev/null
+++ b/report_qweb_pdf_watermark/README.rst
@@ -0,0 +1,62 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+
+=============
+Pdf watermark
+=============
+
+This module was written to add watermarks (backgrounds) to PDF reports.
+
+This is necessary because of the way wkhtmltopdf handles headers and footers, in the current versions if quite impossible to have a background for the complete page.
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. go to your report
+#. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
+#. advanced users (members of group technical settings) can also fill in an expression that returns the data (base64 encoded) to be used as watermark
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+    :alt: Try me on Runbot
+    :target: https://runbot.odoo-community.org/runbot/143/8.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/reporting-engine/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Holger Brunn <hbrunn@therp.nl>
+
+Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/report_qweb_pdf_watermark/__init__.py b/report_qweb_pdf_watermark/__init__.py
new file mode 100644
index 0000000000..7eda98a232
--- /dev/null
+++ b/report_qweb_pdf_watermark/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import models
diff --git a/report_qweb_pdf_watermark/__openerp__.py b/report_qweb_pdf_watermark/__openerp__.py
new file mode 100644
index 0000000000..74ccecf95e
--- /dev/null
+++ b/report_qweb_pdf_watermark/__openerp__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Pdf watermark",
+    "version": "9.0.1.0.0",
+    "author": "Therp BV,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "category": "Reporting",
+    "summary": "Add watermarks to your QWEB PDF reports",
+    "depends": [
+        'report',
+    ],
+    "data": [
+        "demo/report.xml",
+        "views/ir_actions_report_xml.xml",
+    ],
+}
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
new file mode 100644
index 0000000000..c25210ba5f
--- /dev/null
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <report
+            id="demo_report"
+            string="Demo report"
+            model="res.users"
+            report_type="qweb-pdf"
+            name="report_qweb_pdf_watermark.demo_report_view"
+            file="report_qweb_pdf_watermark.demo_report_view"
+            paperformat="report.paperformat_euro"
+        />
+        <record id="demo_report" model="ir.actions.report.xml">
+            <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
+        </record>
+        <template id="demo_report_view">
+            <t t-call="report.html_container">
+                <t t-call="report.external_layout">
+                    <div class="page">
+                        <ul>
+                            <li t-foreach="docs" t-as="doc">
+                                <t t-esc="doc.name" />
+                            </li>
+                        </ul>
+                    </div>
+                </t>
+            </t>
+        </template>
+    </data>
+</openerp>
diff --git a/report_qweb_pdf_watermark/models/__init__.py b/report_qweb_pdf_watermark/models/__init__.py
new file mode 100644
index 0000000000..e9e37ae5e0
--- /dev/null
+++ b/report_qweb_pdf_watermark/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import ir_actions_report_xml
+from . import report
diff --git a/report_qweb_pdf_watermark/models/ir_actions_report_xml.py b/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
new file mode 100644
index 0000000000..d703c02804
--- /dev/null
+++ b/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openerp import fields, models
+
+
+class IrActionsReportXml(models.Model):
+    _inherit = 'ir.actions.report.xml'
+
+    pdf_watermark = fields.Binary('Watermark')
+    pdf_watermark_expression = fields.Char(
+        'Watermark expression', help='An expression yielding the base64 '
+        'encoded data to be used as watermark. \n'
+        'You have access to variables `env` and `docs`')
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
new file mode 100644
index 0000000000..acb9aff60e
--- /dev/null
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from base64 import b64decode
+from logging import getLogger
+from pyPdf import PdfFileWriter, PdfFileReader
+from pyPdf.utils import PdfReadError
+from PIL import Image
+from StringIO import StringIO
+from openerp import api, models, tools
+logger = getLogger(__name__)
+
+
+class Report(models.Model):
+    _inherit = 'report'
+
+    @api.v7
+    def get_pdf(
+        self, cr, uid, ids, report_name, html=None, data=None, context=None
+    ):
+        # pylint: disable=R8110
+        # this override cannot be done in v8 api
+        result = super(Report, self).get_pdf(
+            cr, uid, ids, report_name, html=html, data=data,
+            context=context
+        )
+        report = self._get_report_from_name(cr, uid, report_name)
+        watermark = None
+        if report.pdf_watermark:
+            watermark = b64decode(report.pdf_watermark)
+        else:
+            env = api.Environment(cr, uid, context)
+            watermark = tools.safe_eval(
+                report.pdf_watermark_expression or 'None',
+                dict(env=env, docs=env[report.model].browse(ids)),
+            )
+            if watermark:
+                watermark = b64decode(watermark)
+
+        if not watermark:
+            return result
+
+        pdf = PdfFileWriter()
+        pdf_watermark = None
+        try:
+            pdf_watermark = PdfFileReader(StringIO(watermark))
+        except PdfReadError:
+            # let's see if we can convert this with pillow
+            try:
+                image = Image.open(StringIO(watermark))
+                pdf_buffer = StringIO()
+                if image.mode != 'RGB':
+                    image = image.convert('RGB')
+                resolution = image.info.get(
+                    'dpi', report.paperformat_id.dpi or 90
+                )
+                if isinstance(resolution, tuple):
+                    resolution = resolution[0]
+                image.save(pdf_buffer, 'pdf', resolution=resolution)
+                pdf_watermark = PdfFileReader(pdf_buffer)
+            except:
+                logger.exception('Failed to load watermark')
+
+        if not pdf_watermark:
+            logger.error(
+                'No usable watermark found, got %s...', watermark[:100]
+            )
+            return result
+
+        if pdf_watermark.numPages < 1:
+            logger.error('Your watermark pdf does not contain any pages')
+            return result
+        if pdf_watermark.numPages > 1:
+            logger.debug('Your watermark pdf contains more than one page, '
+                         'all but the first one will be ignored')
+
+        for page in PdfFileReader(StringIO(result)).pages:
+            watermark_page = pdf.addBlankPage(
+                page.mediaBox.getWidth(), page.mediaBox.getHeight()
+            )
+            watermark_page.mergePage(pdf_watermark.getPage(0))
+            watermark_page.mergePage(page)
+
+        pdf_content = StringIO()
+        pdf.write(pdf_content)
+
+        return pdf_content.getvalue()
diff --git a/report_qweb_pdf_watermark/static/description/icon.png b/report_qweb_pdf_watermark/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}<C%<R2Kc9faym6aW`f0Dh5$js*d
z_}}Z!;XIG;_cPz`_vag-p{7Ve$Uq1H00~A(?iu(VaQlMefnU3&OozZXm@69d91cGG
z;O61r&je0NdamH#&)mKsXk?Zb_)B^>d0jUxM@u(PQx^-s)6<jB#=*|j%+$$(&(Xyy
zYgd8+09XKwoa}S2?48%%ZU#L~n^g{fE40h%YEx5by;GuJ(K|vI1uO;0m}=J7R4@Bs
z>97TX<v{QF=s?r`z`m$a0ZvrhBU7}{15RN9M`j!kv_Mp+3~{||YNuFzHNvhMYm3=Q
zo!q+OJ5(%-oNM^I^M%*luKMiVL`lo`bcKGymX7i3MIFWj1i|9+CGNvn`cu-RsK0Qh
zoYlwB>`ehR4?GS^qbkof1cslKgk<Uw6DeIxZyT_?=OwX|lwC*A?ac*gHF7jmS080$
z>U)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~!
zVpnB`o+K7|Al`Q_U<UrcmRnh6jExs}l(hZs0%T~Dnpu-NENdhioRv(T{Qmv>;eD$B
zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA
z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__
zc+blN2UAB0=617@>_<D4$IPL<k1zq(*VmlDPer&h1n6`AG;9A!_W=N$JthhQWXZ<i
zGURc6f<i*joK3xSWaOOXxAc8ES>u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_
zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I
z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz<Z(Qt1jC2cC|
z6WbMo9YgON{L#ZDl$sV4*<CP(>{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U
z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)(
z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH
zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW
z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx
zOGVPhVRTGPtv0o}RfVP;Nd(|CB)<HrC1(%ZOEd8PI?r9b_$Cp-${bh59Z_R7n&YCp
zl8lfMpes*8{FVm;oJH@0LLoWmxD59u?JwHz2iRrAaE0`Hc&g;t5~$P*kdeOZn9OJ3
zRczo@ZkWU)RG+hcfH~{49Vvb3D(W0wRX#|$cA0Iqy^VR~(4hqA2AFI-rK!FM!#fJ_
zGFI@iqJOPXZ!=VjTS3dMuu~9xU3K1&?th;$)cqM#WGxbDEyB$y`#9j%>I;*t&QO8h
zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9
zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz#
z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7t<dboft~zeDZwK=+l2bFWs5^+|r{J6GO9Cwl
z&SW58BRs?XdFLuhtzl7WLbQ#~z#`jAB3AbSUg6jW6@qVd2Q~9qN(izT1y*>F#6nHA
zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K=
z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS
zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C
zuVl&0duN<;uOsB3%T9Fp8t{ED108<?)`y_~Hnd9AUX7h-H?jVuU|}My+C=TjH(jKz
zqMVr0re3S$H@t{zI95qa)+Crz*5Zj}Ao%4Z><+W(nOZd?gDnfNBC3>M8WE61$So|P
zVvqH0SNtDTcs<xiU1;=a39$d&&l5EwoIH1db#`S9Kw!YC1jhR)VbCWMptlUUkpfif
zMzi-i8)WL?|C$*Q?iqbS{w<lA9XN(rD)VS<zn>UdzaMDpT=Ty0pDHHNL@Z0w$Y`XO
z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1
zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_
zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8
zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ>
zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}a<Xwa$pLotZk<
zsykXwQO37I=aXew7x=}YWiW)^p)|C#g+)an!@j?EcY8C0t)BlK#y{YLtkJ6=D6H-5
zp2*ANf@>RBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN
z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=<bK!vY7J*RP!&i_xU}i*o6o
z?xN*1<rEe1L2HBkCSgiYM3a|4w?Bo7CJL7?Eh;9An1m$1t?h1v92<Xg2(#)bjbL|o
zH_H0}!Og=1dOBynXHu>@hbCRcfT5ji<pmK_U*~T(A$I-*rM$8-BCv{=@=7F)2pdtU
z5==tp!}A*&Xgf{F>gwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h
zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&<KAVm#0W>BE*}XfU|H&(FssBqY=hPCt`d
zH?@s2>I(|;fcW&YM6#V<T#ysvE$@4oRO>#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB
zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz
z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I
zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R<sv-KjYb}UVFjITQ)VAEWu*)Lz7*-f^A*H
z<25#Ynt~-Qh?$wWx4$1=T2`j@bKp!)3IXh(LC@)%WGW$+j(tGz(6#bGw&K0j=Np@B
zt}@t$R`z(>?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X
zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD
z<sX7(ZJc+Q;#xP8uk`jnF@a^|TWw*55if6@@}%7lOBaGo9Ia-e?`RPQc^w^EWfhe}
zHWHTvDA+r}Xf5Yqpr;QU-88%QC9F_>#z-)AXwSRY?<M%E84!g*1GC?E>OPefw^iI+
z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd
z$<h)Fm>6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs
z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I
z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$
z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV<GYik+VfZene%bm(n6
z`r@rc^TVw7EN{|O7rORMlw)zt(Z#enc3joE#IIk!M)L8gk^go9E9AxiP9o#OqmvV>
z@;rlc*NRK7i3y5BETSKuumEN`Xu_8<BQ)z0!-JuC8x}?$qo8SEko}oUWNI(4h*VHO
zAi!Egy!f(o9aHs2dhSE6ki(be*&w&+WLOB<(b3T_Hide(NvVvLQV{BN|2?UJFaY*@
z9CXA5B_*8i5Bf6sn~d`R>GP1Ri=OK<SGIb#BCTo3qI#UBUg+dkR+2ilUwIg%XFV;l
z+>Q$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s
zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6
zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5<g6yi=XozU}zReXL{rA%c`$IQAs<ObZ
zep*ITZ0C(~W*`?XH^l1t7&+qigAfY9tVJ5DH!~jY>#ZRj8kg}dS7_V&^%#Do==#`u
zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK<aUZ^OhBu;1e6t#{
zxKehVgz`HT;A`FMivG<tq0OcrXwHUX_<$j<uk%m>#HN`!1vBJHnC+RM&yIh8{gG2q
zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH
zVWo*OwYElb#uyW{Imam6f2<eMTQj#)z8+N&ZY?tSPo%&2eVNU=4=?rlO<*9Twaxco
zEVE=Jh?_x>rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c
zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT
zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+
z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ
zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy
zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC)
zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#B<pkvWZft^C&
z;+zNo+VJNluxaDF!`gW+F0=MxsCQ~~#CYKa;ULfj5hTa8a6;d*(<eeQ7-ZQgz2et^
zf|7URfj;x*#HiF0wuBCOTEpbeD&kkENqolCm2#cQGHCeEC<&I3j+P6?sX?BPp4~46
zx-S~EJ>oo{AH8n$<d4loB?vL3RqXwK_COrQ6xRoWGOdFnWy(hhzrG8k;2k}8Zj&>a
zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x!
zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X
zZ3WYJtHp_ri(}SQAPjv+Y+0=<GD??Na(2AG`s>fH4krOP@S&=zZ-t1jW1o@}z;xk8
z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A
z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H
zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n=
z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~N<X{IYiJ3k=4u-u*nJEBnJ<OdI8P
zXmK`OYkO5a{YDhI3PL|H4m=p>Bvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK
z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z
zzCR$P#uktu+#!w)cX!<osOkId_HzAT-HD2N`M+v2l+zwdW%GgZbQMuhfE*hHjKXKg
z45hphqVETPDbX6wpTlZqza0gFaRGh`3L~0id)F6#%@9;w(e%PjzuD7@inuToA!B?F
zCMLJc!u{3N)s?lB-!11!GxXsCak8zQomO)gmn02f-5~OkMYnm~#jVwwYNw@LAv!KN
z-n`q1|AXw*TW>lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h
z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD
z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW
zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@
zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz
z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y<
zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X
zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6
zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V<h953|jk-C&|3)z%
ze&_30-6q1)a0(!xXqA+_t(WC`HA_yYaW@>`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6%
z2(}&uGRF;p9<Q%jdNy1%e7XTzyu7EEQT(5LrnvX~T%K!IuDyHY`ZneVJu#k_1T)xA
z*yxB?y4!pOJ$DTZzBm|8OIQq+AtV25aJ+X5EJjAu><tfuiNClI2BSoMgqLnU-5t95
zEnZ(^g~1RgD=UMB({c;$HujG&%DqGF;5jI~roRT+(rOoS$6f6SsURIuAVkAeIVc~{
z5ZxLN%m%Z*Sg;qYCf3<$dE6~&w_!EBx%yl4YC~LH{FCFNRBc_I>2eS*sE*o<YSPrx
z{M(reV{~jKue#Y6ZOnqJia{fQc!UxV4m)l389OmzR6A3|2!i<P{r82jKw+zq4%@ny
znopi6g!1Vx9Bml#a~KdL2lp2C)qSTKIh43vgycQHfQb_I!kQY&p;X@Bz|{^SXsW1K
zP&Ag1CW_r6u5-4=s(W>R$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(|
z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4<V=<
zfr<*%iOB1EY}w3tF2Cwl7a2OS&~Y-lu<s)T^9=OFU8(CeN|63BiMxf*)5gesGU<eZ
z9DigzL3+quZ1o2T<KAZbCGJx&lrl*e#}Dpv24bZO$B<Yoc5hbeP0y?@P%|Tvw||e%
zV#e^q0D2R_Oq_c+=x5vP&hg4k+df{o7$aNZCM>PdpwWDop%^}n;dD#K4s#DYA8SHZ
z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H
zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^W<wsNa}nUDpNk$q{>Yu2u5kubqmwp%drJ6
z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d}
z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A
zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&<F<Z7l=VnwB^RA&^APMi=Tn
zNc}%IJL~xB4OP6bJNwAw)~Ma2=UP0dhr%X=kco(it+@F<#$xrIJ8@|{Buh<)h`xg?
z_U}pe=3#zmDfdqE4`Hyn<!?&CfCp#GTeXo8;AYd1Opd&cXER8cBSOF3iFJ#XPgQVp
zZSiQf7V^Dt?ITs8aMF~e1hq0P@^oB)#byh|6q_7F1B%ST%WL~J?ySn>YOi-3|1QKB
z<?_cUy)V3go%%^l)lRa=dmY_XQG3Z{Q?52d$qG}vIe|EZbYEtrR$rh(iS)O#dU-(>
z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp
zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#<i<Zx(`=7k~{%`w&<EbG}U<
z0%E^8lyw>s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@<TSeYlROCt(gU?O((-qu
zs>QS0TEL_?njX|<LXnSC4TlId(D4W|GQ?L@$3Ue@N8p=l9-sC<=z(lPk;^sT(v2*k
zc~vp#Hp`mXjzhml2NMCh^h5)sqsan+jJ_l<a4w|G&ac02hrz8#6|kFraA~rta0}!q
zB4BE{QWY7MtxHn_xB);Avf#Lf<GG<A?Q3JVyc1p8^H}$8(Gn=_&F1!m8$sKyeue+L
z5&392wm+wO;_oXoTEJ=wxVXk}dt<d~CgUUMW_PPTe(c<7n18#mVaX)vK}-PzZq7<b
zNJbVTFaq(8ZLx|A*G$H3ugT2aVziDEGa66FVt@hr1|D{RWN6yuqlglM!rp^YG;UpG
zrnm?ek079l3VoOU^p%f^A9Yzn8IVX?^rB4LbgJ|PONhzM_0{P?S(V$OI=u5IBjfT#
z0ntLLnhg5$0fAHJaG6HCx4X7;RmvMtE}8C>@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6#
z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f#
zuT7fv<Q3o5LspCx-RPkzLw{VsDE>jSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC
zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv!
zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8<JV*@W33SMHM;w!OmUXar{O;_8j>ul%rG
z-<zwGD)!Y{+(T{%ob~79zpXX%zulyiy1_UHWvu@YqxKAK3e9GO6Os4R0Naujn>wfS
zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9
z^zP;K#|)$`^Rb{rnH<AdQ^(;gQMcF>GH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE#
z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz
zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8<!P
zAOHj?oPbjQ%hh|vE_1IMB)43eQpeLi&)R>etW=xJvni)8eHi`H$%#zn^WJ<U7gogJ
z?A^!2J~rI78JH|Ml2EldmKY5K8;Zx(FGcBdM<5oe#G+nd6dObqz@Af%%M*aBE_pn8
zXQo2`Bw*IwvP3#1Ev<%YocpBodO9+Rw~`5*CY3{L;qf1PxV!r%NI+#Q1f8GU7$~#U
zAA9$4&g-k=8BYi*3i@0^UX}nTQVyOf)8T(}G^Ti?Vqvk~bJRR#EAQ?u`dClPxk@{;
zxvO?%jSX`2{8|^z0*C5DR1Z^>5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t
z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN
zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01F<S%GT3P{Ck&Y*^gWuie`o_g+ZNDNIV|F
z)zEe|Ij*4$H1(<RLz0($;AD3VsUJwI@liw^?fh(V?VC`Sz7h`*Q<VYlhbHJ?&h+!W
zAJC)U;Lx_QRaSNFYbyi|7+MeNTgA+Znh}qFzf>mx5XbRo6+n|pP(&nodMoap^z{~q
ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k
zQ<WB5+u#`K#~J$81)#?BuTOKLk|+S>^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG
z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff
z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1
zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO
zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}2<F#{*|k0E{$&_`~)
zkzDcsi#!7r<a8lPUCMj?{CK;e|9#-xj>6NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$
zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV(<Rzgqw(Ze!7hEGKKx((>
z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb
zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4
z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_N<mojSrG!`
zgkqx4t<XLL6ZUppvjeV9PJ6dG>hT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{
zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*<bTMtKO;_Z)R
zRSOJrd5TFO0aO%#%-sNa{`SiQ^$$1^@oUd&^lB{MKZ>vIg?@fVFSmMpaw0qtTRbx}
z({Pg?#{2`sc9)M5N$*N|4;^t$+Q<Wh^yJ?FzJ*$wiB{j;CMy+?m1MbsJo0ubR==f9
z>P?#mo<zt1E6=Ilm*nbmYmpxfAj7*m*Wh@=7|;!%(-pviW`nuCktLveet9^$*y^>v
zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22
zc2Ix|App^>v6(3L_MCU0d3W##AB<Fxl*nmny6_RsCu%1a)so}}uCXSzwY70Y@uTxK
z=5nu(N*2HDbrIcL)t_*{*84mvmV_Y9<vxHJJ;0gUdNjyW)jDb|@|j*qR8;gsMa5Ir
z02fHv=%xyN9VLv_ZLL4y|F*p$S^^T47m{aok5{rmM{$s7^Xu2!_fo1$IG6kkG_Tgx
zFfjPm3;g>0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq
zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t<
z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k
z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp
z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{}
zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/report_qweb_pdf_watermark/tests/__init__.py b/report_qweb_pdf_watermark/tests/__init__.py
new file mode 100644
index 0000000000..e4637a6417
--- /dev/null
+++ b/report_qweb_pdf_watermark/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import test_report_qweb_pdf_watermark
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
new file mode 100644
index 0000000000..7525a95a31
--- /dev/null
+++ b/report_qweb_pdf_watermark/tests/test_report_qweb_pdf_watermark.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# © 2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openerp.tests.common import TransactionCase
+
+
+class TestReportQwebPdfWatermark(TransactionCase):
+    def test_report_qweb_pdf_watermark(self):
+        # with our image, we have three
+        self._test_report_images(3)
+
+        self.env.ref('report_qweb_pdf_watermark.demo_report').write({
+            'pdf_watermark_expression': False,
+        })
+        # without, we have two
+        self._test_report_images(2)
+
+        self.env.ref('report_qweb_pdf_watermark.demo_report').write({
+            'pdf_watermark': self.env.user.company_id.logo,
+        })
+        # and now we should have three again
+        self._test_report_images(3)
+
+    def _test_report_images(self, number):
+        pdf = self.registry['report'].get_pdf(
+            self.cr,
+            self.uid,
+            self.env['res.users'].search([]).ids,
+            'report_qweb_pdf_watermark.demo_report_view',
+            context={}
+        )
+        self.assertEqual(pdf.count('/Subtype /Image'), number)
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
new file mode 100644
index 0000000000..a9b59502f8
--- /dev/null
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="act_report_xml_view" model="ir.ui.view">
+            <field name="model">ir.actions.report.xml</field>
+            <field name="inherit_id" ref="base.act_report_xml_view" />
+            <field name="arch" type="xml">
+                <field name="attachment" position="after">
+                    <field name="pdf_watermark" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" />
+                    <field name="pdf_watermark_expression" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" groups="base.group_no_one" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From e835161d65ec97652e87bc8b0ac7769e1726dd3d Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 14 Jan 2017 00:38:46 -0500
Subject: [PATCH 02/42] OCA Transbot updated translations from Transifex

---
 report_qweb_pdf_watermark/i18n/ca.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/da.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/de.po    | 54 +++++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/el_GR.po | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/es.po    | 54 +++++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/es_CO.po | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/fr.po    | 52 ++++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/gl.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/hr.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/it.po    | 52 ++++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/nb_NO.po | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/pl.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/pt.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/pt_BR.po | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/pt_PT.po | 52 ++++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/sl.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/tr.po    | 51 +++++++++++++++++++++++
 report_qweb_pdf_watermark/i18n/tr_TR.po | 51 +++++++++++++++++++++++
 18 files changed, 927 insertions(+)
 create mode 100644 report_qweb_pdf_watermark/i18n/ca.po
 create mode 100644 report_qweb_pdf_watermark/i18n/da.po
 create mode 100644 report_qweb_pdf_watermark/i18n/de.po
 create mode 100644 report_qweb_pdf_watermark/i18n/el_GR.po
 create mode 100644 report_qweb_pdf_watermark/i18n/es.po
 create mode 100644 report_qweb_pdf_watermark/i18n/es_CO.po
 create mode 100644 report_qweb_pdf_watermark/i18n/fr.po
 create mode 100644 report_qweb_pdf_watermark/i18n/gl.po
 create mode 100644 report_qweb_pdf_watermark/i18n/hr.po
 create mode 100644 report_qweb_pdf_watermark/i18n/it.po
 create mode 100644 report_qweb_pdf_watermark/i18n/nb_NO.po
 create mode 100644 report_qweb_pdf_watermark/i18n/pl.po
 create mode 100644 report_qweb_pdf_watermark/i18n/pt.po
 create mode 100644 report_qweb_pdf_watermark/i18n/pt_BR.po
 create mode 100644 report_qweb_pdf_watermark/i18n/pt_PT.po
 create mode 100644 report_qweb_pdf_watermark/i18n/sl.po
 create mode 100644 report_qweb_pdf_watermark/i18n/tr.po
 create mode 100644 report_qweb_pdf_watermark/i18n/tr_TR.po

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
new file mode 100644
index 0000000000..922605a139
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Carles Antoli <carlesantoli@hotmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2017\n"
+"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Informe"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
new file mode 100644
index 0000000000..d4abe9a775
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017\n"
+"Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
new file mode 100644
index 0000000000..07eaf28f16
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -0,0 +1,54 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Rudolf Schnapka <rs@techno-flex.de>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-04 05:58+0000\n"
+"PO-Revision-Date: 2017-03-04 05:58+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
+"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als Wasserzeichen, liefert.\n"
+"Sie haben die Variablen 'env' und 'docs' zur Verfügung"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr "Beispielbericht"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Bericht"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr "Wasserzeichen"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr "Wasserzeichnen-Ausdruck"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
new file mode 100644
index 0000000000..5e375d30b4
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Kostas Goutoudis <goutoudis@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Kostas Goutoudis <goutoudis@gmail.com>, 2017\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Αναφορά"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
new file mode 100644
index 0000000000..8e2d25cfda
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -0,0 +1,54 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+"Una expresión que obtenga los datos codificados en base64 a ser usada como marca de agua.\n"
+"Tiene acceso a las variables `env` y `docs`."
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr "Informe demo"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Informe"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr "Marca de agua"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr "Expresión para la marca de agua"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
new file mode 100644
index 0000000000..02428bcf50
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# John Toro <johntoro@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: John Toro <johntoro@gmail.com>, 2017\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Iforme"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
new file mode 100644
index 0000000000..7119bbd017
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Yannick Vaucher <yannick.vaucher@camptocamp.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
new file mode 100644
index 0000000000..a1a41315f5
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Alejandro Santana <alejandrosantana@anubia.es>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>, 2017\n"
+"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Informe"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
new file mode 100644
index 0000000000..1fba7351b9
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Bole <bole@dajmi5.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
+"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
new file mode 100644
index 0000000000..76fe59701a
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Paolo Valier <paolo.valier@hotmail.it>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Report"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
new file mode 100644
index 0000000000..9ef3189b0d
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
new file mode 100644
index 0000000000..57f39208da
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Raport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
new file mode 100644
index 0000000000..b4eee93e02
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Relatório"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
new file mode 100644
index 0000000000..6002005fba
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Armando Vulcano Junior <vulcano@uol.com.br>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Armando Vulcano Junior <vulcano@uol.com.br>, 2017\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Relatório"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
new file mode 100644
index 0000000000..9be87c18a2
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Carla Berjano <berjano.carla@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-14 06:07+0000\n"
+"PO-Revision-Date: 2017-01-14 06:07+0000\n"
+"Last-Translator: Carla Berjano <berjano.carla@gmail.com>, 2017\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Relatório"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
new file mode 100644
index 0000000000..b75fa34950
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
+"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Poročilo"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
new file mode 100644
index 0000000000..d721393f1c
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017\n"
+"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
new file mode 100644
index 0000000000..3ed8bbdb42
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Ozge Altinisik <ozge@altinkaya.com.tr>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Ozge Altinisik <ozge@altinkaya.com.tr>, 2017\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Rapor"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""

From 4141e2520b5ae3972a90355483e95f49a297c5e7 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@opener.am>
Date: Sat, 22 Apr 2017 14:39:22 +0200
Subject: [PATCH 03/42] [MIG] report_qweb_pdf_watermark

---
 report_qweb_pdf_watermark/README.rst          |  7 ++-
 .../{__openerp__.py => __manifest__.py}       |  2 +-
 report_qweb_pdf_watermark/demo/report.xml     | 52 +++++++++----------
 .../models/ir_actions_report_xml.py           |  2 +-
 report_qweb_pdf_watermark/models/report.py    | 19 +++----
 .../tests/test_report_qweb_pdf_watermark.py   |  5 +-
 .../views/ir_actions_report_xml.xml           | 24 ++++-----
 7 files changed, 48 insertions(+), 63 deletions(-)
 rename report_qweb_pdf_watermark/{__openerp__.py => __manifest__.py} (94%)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 35c63a0504..a15b380e46 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -6,9 +6,7 @@
 Pdf watermark
 =============
 
-This module was written to add watermarks (backgrounds) to PDF reports.
-
-This is necessary because of the way wkhtmltopdf handles headers and footers, in the current versions if quite impossible to have a background for the complete page.
+This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
 
 Usage
 =====
@@ -17,7 +15,7 @@ To use this module, you need to:
 
 #. go to your report
 #. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
-#. advanced users (members of group technical settings) can also fill in an expression that returns the data (base64 encoded) to be used as watermark
+#. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
     :alt: Try me on Runbot
@@ -43,6 +41,7 @@ Contributors
 ------------
 
 * Holger Brunn <hbrunn@therp.nl>
+* Stefan Rijnhart <stefan@opener.am>
 
 Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
 
diff --git a/report_qweb_pdf_watermark/__openerp__.py b/report_qweb_pdf_watermark/__manifest__.py
similarity index 94%
rename from report_qweb_pdf_watermark/__openerp__.py
rename to report_qweb_pdf_watermark/__manifest__.py
index 74ccecf95e..ef02ede82a 100644
--- a/report_qweb_pdf_watermark/__openerp__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "9.0.1.0.0",
+    "version": "10.0.1.0.0",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Reporting",
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
index c25210ba5f..7528dbf9db 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <report
-            id="demo_report"
-            string="Demo report"
-            model="res.users"
-            report_type="qweb-pdf"
-            name="report_qweb_pdf_watermark.demo_report_view"
-            file="report_qweb_pdf_watermark.demo_report_view"
-            paperformat="report.paperformat_euro"
+<odoo>
+    <report
+        id="demo_report"
+        string="Demo report"
+        model="res.users"
+        report_type="qweb-pdf"
+        name="report_qweb_pdf_watermark.demo_report_view"
+        file="report_qweb_pdf_watermark.demo_report_view"
+        paperformat="report.paperformat_euro"
         />
-        <record id="demo_report" model="ir.actions.report.xml">
-            <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
-        </record>
-        <template id="demo_report_view">
-            <t t-call="report.html_container">
-                <t t-call="report.external_layout">
-                    <div class="page">
-                        <ul>
-                            <li t-foreach="docs" t-as="doc">
-                                <t t-esc="doc.name" />
-                            </li>
-                        </ul>
-                    </div>
-                </t>
+    <record id="demo_report" model="ir.actions.report.xml">
+        <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
+    </record>
+    <template id="demo_report_view">
+        <t t-call="report.html_container">
+            <t t-call="report.external_layout">
+                <div class="page">
+                    <ul>
+                        <li t-foreach="docs" t-as="doc">
+                            <t t-esc="doc.name" />
+                        </li>
+                    </ul>
+                </div>
             </t>
-        </template>
-    </data>
-</openerp>
+        </t>
+    </template>
+</odoo>
diff --git a/report_qweb_pdf_watermark/models/ir_actions_report_xml.py b/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
index d703c02804..ff2116198b 100644
--- a/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
+++ b/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import fields, models
+from odoo import fields, models
 
 
 class IrActionsReportXml(models.Model):
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index acb9aff60e..5125cd3c19 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -7,32 +7,25 @@
 from pyPdf.utils import PdfReadError
 from PIL import Image
 from StringIO import StringIO
-from openerp import api, models, tools
+from odoo import api, models, tools
 logger = getLogger(__name__)
 
 
 class Report(models.Model):
     _inherit = 'report'
 
-    @api.v7
-    def get_pdf(
-        self, cr, uid, ids, report_name, html=None, data=None, context=None
-    ):
-        # pylint: disable=R8110
-        # this override cannot be done in v8 api
+    @api.model
+    def get_pdf(self, docids, report_name, html=None, data=None):
         result = super(Report, self).get_pdf(
-            cr, uid, ids, report_name, html=html, data=data,
-            context=context
-        )
-        report = self._get_report_from_name(cr, uid, report_name)
+            docids, report_name, html=html, data=data)
+        report = self._get_report_from_name(report_name)
         watermark = None
         if report.pdf_watermark:
             watermark = b64decode(report.pdf_watermark)
         else:
-            env = api.Environment(cr, uid, context)
             watermark = tools.safe_eval(
                 report.pdf_watermark_expression or 'None',
-                dict(env=env, docs=env[report.model].browse(ids)),
+                dict(env=self.env, docs=self.env[report.model].browse(docids)),
             )
             if watermark:
                 watermark = b64decode(watermark)
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 7525a95a31..c39e8cdd9b 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
@@ -22,11 +22,8 @@ def test_report_qweb_pdf_watermark(self):
         self._test_report_images(3)
 
     def _test_report_images(self, number):
-        pdf = self.registry['report'].get_pdf(
-            self.cr,
-            self.uid,
+        pdf = self.env['report'].get_pdf(
             self.env['res.users'].search([]).ids,
             'report_qweb_pdf_watermark.demo_report_view',
-            context={}
         )
         self.assertEqual(pdf.count('/Subtype /Image'), number)
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
index a9b59502f8..3668c4fc75 100644
--- a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="act_report_xml_view" model="ir.ui.view">
-            <field name="model">ir.actions.report.xml</field>
-            <field name="inherit_id" ref="base.act_report_xml_view" />
-            <field name="arch" type="xml">
-                <field name="attachment" position="after">
-                    <field name="pdf_watermark" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" />
-                    <field name="pdf_watermark_expression" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" groups="base.group_no_one" />
-                </field>
+<odoo>
+    <record id="act_report_xml_view" model="ir.ui.view">
+        <field name="model">ir.actions.report.xml</field>
+        <field name="inherit_id" ref="base.act_report_xml_view" />
+        <field name="arch" type="xml">
+            <field name="attachment" position="after">
+                <field name="pdf_watermark" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" />
+                <field name="pdf_watermark_expression" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" groups="base.group_no_one" />
             </field>
-        </record>
-    </data>
-</openerp>
+        </field>
+    </record>
+</odoo>

From ab19d7e0bd87f28469a91bfb6d93dfcadf366f89 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@opener.am>
Date: Mon, 24 Apr 2017 19:36:34 +0200
Subject: [PATCH 04/42] [ADD] Prioritize background transparency

---
 report_qweb_pdf_watermark/README.rst                   |  4 ++++
 report_qweb_pdf_watermark/__manifest__.py              |  1 +
 .../static/src/css/report_qweb_pdf_watermark.css       |  3 +++
 report_qweb_pdf_watermark/views/layout_templates.xml   | 10 ++++++++++
 4 files changed, 18 insertions(+)
 create mode 100644 report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css
 create mode 100644 report_qweb_pdf_watermark/views/layout_templates.xml

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index a15b380e46..cac6f76481 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -21,6 +21,10 @@ To use this module, you need to:
     :alt: Try me on Runbot
     :target: https://runbot.odoo-community.org/runbot/143/8.0
 
+Known Issues
+============
+This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.
+
 Bug Tracker
 ===========
 
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index ef02ede82a..e6e779d453 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -14,5 +14,6 @@
     "data": [
         "demo/report.xml",
         "views/ir_actions_report_xml.xml",
+        "views/layout_templates.xml",
     ],
 }
diff --git a/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css b/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css
new file mode 100644
index 0000000000..83cc2eb021
--- /dev/null
+++ b/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css
@@ -0,0 +1,3 @@
+body {
+    background: transparent !important;
+}
diff --git a/report_qweb_pdf_watermark/views/layout_templates.xml b/report_qweb_pdf_watermark/views/layout_templates.xml
new file mode 100644
index 0000000000..fee74c753c
--- /dev/null
+++ b/report_qweb_pdf_watermark/views/layout_templates.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!-- Include fix for https://github.com/odoo/odoo/issues/16610 -->
+    <template id="assets_pdf" inherit_id="report.assets_pdf">
+        <link position="after">
+            <link href="/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
+                  rel="stylesheet"/>
+        </link>
+    </template>
+</odoo>

From e38a65b359af6cf2a43f76e40ef151f2df06c356 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 3 Jun 2017 08:34:25 +0200
Subject: [PATCH 05/42] OCA Transbot updated translations from Transifex

---
 report_qweb_pdf_watermark/i18n/hr_HR.po | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 report_qweb_pdf_watermark/i18n/hr_HR.po

diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
new file mode 100644
index 0000000000..8682c48f6d
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Bole <bole@dajmi5.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-31 03:52+0000\n"
+"PO-Revision-Date: 2017-05-31 03:52+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: hr_HR\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"

From af06f38cbf1174ce47b99107f6b40d7f50fd56d0 Mon Sep 17 00:00:00 2001
From: etobella <etobella@creublanca.es>
Date: Tue, 20 Jun 2017 11:23:36 +0200
Subject: [PATCH 06/42] [FIX] Fix Watermark from PNG

---
 report_qweb_pdf_watermark/__manifest__.py  | 3 ++-
 report_qweb_pdf_watermark/models/report.py | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index e6e779d453..95b4c53618 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -4,7 +4,8 @@
 {
     "name": "Pdf watermark",
     "version": "10.0.1.0.0",
-    "author": "Therp BV,Odoo Community Association (OCA)",
+    "author": "Therp BV, "
+              "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Reporting",
     "summary": "Add watermarks to your QWEB PDF reports",
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index 5125cd3c19..82d0d311aa 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -8,6 +8,12 @@
 from PIL import Image
 from StringIO import StringIO
 from odoo import api, models, tools
+from PIL import PdfImagePlugin # flake8: noqa
+
+# PdfImagePlugin must be loaded in order to work PNG to PDF transformation
+# This issue is related to Pillow creation, as can be seen in its source code:
+# https://github.com/python-pillow/Pillow/blob/master/PIL/PdfImagePlugin.py
+
 logger = getLogger(__name__)
 
 
@@ -40,6 +46,7 @@ def get_pdf(self, docids, report_name, html=None, data=None):
         except PdfReadError:
             # let's see if we can convert this with pillow
             try:
+                Image.init()
                 image = Image.open(StringIO(watermark))
                 pdf_buffer = StringIO()
                 if image.mode != 'RGB':

From 73f9cb0c66866cf1846adc27fe2d86951ab08993 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 1 Jul 2017 09:19:08 +0200
Subject: [PATCH 07/42] OCA Transbot updated translations from Transifex

---
 report_qweb_pdf_watermark/i18n/hr_HR.po | 14 ++++---
 report_qweb_pdf_watermark/i18n/nl_NL.po | 51 +++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 report_qweb_pdf_watermark/i18n/nl_NL.po

diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index 8682c48f6d..cd44a13096 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 03:52+0000\n"
-"PO-Revision-Date: 2017-05-31 03:52+0000\n"
+"POT-Creation-Date: 2017-07-13 02:42+0000\n"
+"PO-Revision-Date: 2017-07-13 02:42+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -24,26 +24,28 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
+"Izraz koji polučuje base46 kodirane podatke koji se koriste kao vodeni žig.\n"
+"Imate pristup varijablama 'env' i 'docs'"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
-msgstr ""
+msgstr "Demo izvještaj"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_report
 msgid "Report"
-msgstr ""
+msgstr "Izvještaj"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
-msgstr ""
+msgstr "Vodeni žig"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
 msgid "Watermark expression"
-msgstr ""
+msgstr "Izraz vodenog žiga"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
new file mode 100644
index 0000000000..384ca4ac01
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * report_qweb_pdf_watermark
+# 
+# Translators:
+# Peter Hageman <hageman.p@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-23 00:28+0000\n"
+"PO-Revision-Date: 2017-06-23 00:28+0000\n"
+"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: nl_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"

From df96999c87c77b6595476416f0abe9dc93fc10bf Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 8 Jun 2017 17:01:05 +0200
Subject: [PATCH 08/42] [IMP] use PyPDF2 if possible

---
 report_qweb_pdf_watermark/README.rst       |  5 +++++
 report_qweb_pdf_watermark/__manifest__.py  |  2 +-
 report_qweb_pdf_watermark/models/report.py | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index cac6f76481..07f681b185 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -8,6 +8,11 @@ Pdf watermark
 
 This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
 
+Installation
+============
+
+This module works out of the box, but is faster if you install the python library PyPDF2.
+
 Usage
 =====
 
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 95b4c53618..d11b849342 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "10.0.1.0.0",
+    "version": "10.0.1.0.1",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index 82d0d311aa..cc89490b9a 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -3,16 +3,22 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from base64 import b64decode
 from logging import getLogger
-from pyPdf import PdfFileWriter, PdfFileReader
-from pyPdf.utils import PdfReadError
 from PIL import Image
 from StringIO import StringIO
-from odoo import api, models, tools
-from PIL import PdfImagePlugin # flake8: noqa
 
-# PdfImagePlugin must be loaded in order to work PNG to PDF transformation
-# This issue is related to Pillow creation, as can be seen in its source code:
-# https://github.com/python-pillow/Pillow/blob/master/PIL/PdfImagePlugin.py
+from pyPdf import PdfFileWriter, PdfFileReader
+from pyPdf.utils import PdfReadError
+try:
+    from PyPDF2 import PdfFileWriter, PdfFileReader  # pylint: disable=W0404
+    from PyPDF2.utils import PdfReadError  # pylint: disable=W0404
+except ImportError:
+    pass
+try:
+    # we need this to be sure PIL has loaded PDF support
+    from PIL import PdfImagePlugin  # noqa: F401
+except ImportError:
+    pass
+from odoo import api, models, tools
 
 logger = getLogger(__name__)
 

From 929c0e425f0f8d0288956e17942b06bff0da0eff Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Tue, 18 Jul 2017 09:38:56 +0200
Subject: [PATCH 09/42] [UPD] build environment

---
 .../tests/test_report_qweb_pdf_watermark.py                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 c39e8cdd9b..9397d4d84e 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
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp.tests.common import TransactionCase
+from PIL import Image
+from openerp.tests.common import HttpCase
 
 
-class TestReportQwebPdfWatermark(TransactionCase):
+class TestReportQwebPdfWatermark(HttpCase):
     def test_report_qweb_pdf_watermark(self):
+        Image.init()
         # with our image, we have three
         self._test_report_images(3)
 

From 352a7259172e7df26f808ab25f08603bbbb39f7a Mon Sep 17 00:00:00 2001
From: Jordi Ballester <jordi.ballester@eficent.com>
Date: Thu, 14 Sep 2017 13:35:59 +0200
Subject: [PATCH 10/42] fix test_report_qweb_signer - tests were causing travis
 to stall

---
 .../tests/test_report_qweb_pdf_watermark.py                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9397d4d84e..19d5196140 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
@@ -2,7 +2,7 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from PIL import Image
-from openerp.tests.common import HttpCase
+from odoo.tests.common import HttpCase
 
 
 class TestReportQwebPdfWatermark(HttpCase):

From 2f01de6fac9f593b893df0c4809786eb0331e764 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 3 Mar 2018 11:38:00 +0100
Subject: [PATCH 11/42] OCA Transbot updated translations from Transifex

---
 report_qweb_pdf_watermark/i18n/hr.po | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index 1fba7351b9..bf2d355651 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -3,14 +3,15 @@
 # * report_qweb_pdf_watermark
 # 
 # Translators:
-# Bole <bole@dajmi5.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Bole <bole@dajmi5.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-10 03:40+0000\n"
-"PO-Revision-Date: 2017-01-10 03:40+0000\n"
-"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
+"POT-Creation-Date: 2018-02-16 01:44+0000\n"
+"PO-Revision-Date: 2018-02-16 01:44+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +25,28 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
+"Izraz koji polučuje base46 kodirane podatke koji se koriste kao vodeni žig.\n"
+"Imate pristup varijablama 'env' i 'docs'"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
-msgstr ""
+msgstr "Demo izvještaj"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_report
 msgid "Report"
-msgstr ""
+msgstr "Izvještaj"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
-msgstr ""
+msgstr "Vodeni žig"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
 msgid "Watermark expression"
-msgstr ""
+msgstr "Izraz vodenog žiga"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml

From a26efbf12e60982011695fa159e5d99faa6d2d1c Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@opener.am>
Date: Wed, 28 Feb 2018 15:40:35 +0100
Subject: [PATCH 12/42] [FIX] Don't break printing some upstream reports with
 invalid models When no background configuration is present on the report
 definition, don't try to browse the report model especially because this
 breaks some upstream reports (see https://github.com/odoo/odoo/pull/23389)

---
 report_qweb_pdf_watermark/__manifest__.py  | 2 +-
 report_qweb_pdf_watermark/models/report.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index d11b849342..f4ca0611c8 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "10.0.1.0.1",
+    "version": "10.0.1.0.2",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index cc89490b9a..f77ed7592a 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -34,9 +34,9 @@ def get_pdf(self, docids, report_name, html=None, data=None):
         watermark = None
         if report.pdf_watermark:
             watermark = b64decode(report.pdf_watermark)
-        else:
+        elif report.pdf_watermark_expression:
             watermark = tools.safe_eval(
-                report.pdf_watermark_expression or 'None',
+                report.pdf_watermark_expression,
                 dict(env=self.env, docs=self.env[report.model].browse(docids)),
             )
             if watermark:

From 6438c673964d4dea02be176f53b07370a1b38af8 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 23 Jun 2018 20:06:13 +0000
Subject: [PATCH 13/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 report_qweb_pdf_watermark/i18n/ca.po          |  4 +-
 report_qweb_pdf_watermark/i18n/da.po          |  4 +-
 report_qweb_pdf_watermark/i18n/de.po          |  7 +--
 report_qweb_pdf_watermark/i18n/el_GR.po       |  7 +--
 report_qweb_pdf_watermark/i18n/es.po          |  7 +--
 report_qweb_pdf_watermark/i18n/es_CO.po       |  7 +--
 report_qweb_pdf_watermark/i18n/fr.po          |  4 +-
 report_qweb_pdf_watermark/i18n/gl.po          |  4 +-
 report_qweb_pdf_watermark/i18n/hr.po          |  7 +--
 report_qweb_pdf_watermark/i18n/hr_HR.po       | 10 ++--
 report_qweb_pdf_watermark/i18n/it.po          |  4 +-
 report_qweb_pdf_watermark/i18n/nb_NO.po       |  7 +--
 report_qweb_pdf_watermark/i18n/nl_NL.po       |  7 +--
 report_qweb_pdf_watermark/i18n/pl.po          |  7 +--
 report_qweb_pdf_watermark/i18n/pt.po          |  4 +-
 report_qweb_pdf_watermark/i18n/pt_BR.po       |  7 +--
 report_qweb_pdf_watermark/i18n/pt_PT.po       |  7 +--
 .../i18n/report_qweb_pdf_watermark.pot        | 46 +++++++++++++++++++
 report_qweb_pdf_watermark/i18n/sl.po          |  7 +--
 report_qweb_pdf_watermark/i18n/tr.po          |  4 +-
 report_qweb_pdf_watermark/i18n/tr_TR.po       |  7 +--
 21 files changed, 114 insertions(+), 54 deletions(-)
 create mode 100644 report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index 922605a139..b4e6971225 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Carles Antoli <carlesantoli@hotmail.com>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index d4abe9a775..addddf408e 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index 07eaf28f16..dfce4fd350 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-03-04 05:58+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,7 +25,8 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als Wasserzeichen, liefert.\n"
+"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als "
+"Wasserzeichen, liefert.\n"
 "Sie haben die Variablen 'env' und 'docs' zur Verfügung"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 5e375d30b4..7c18715b0a 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Kostas Goutoudis <goutoudis@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Kostas Goutoudis <goutoudis@gmail.com>, 2017\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
+"el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index 8e2d25cfda..dc33655cd6 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,7 +25,8 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Una expresión que obtenga los datos codificados en base64 a ser usada como marca de agua.\n"
+"Una expresión que obtenga los datos codificados en base64 a ser usada como "
+"marca de agua.\n"
 "Tiene acceso a las variables `env` y `docs`."
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index 02428bcf50..9df7ededdb 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # John Toro <johntoro@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: John Toro <johntoro@gmail.com>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index 7119bbd017..5f26afaf24 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Yannick Vaucher <yannick.vaucher@camptocamp.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index a1a41315f5..002e1e7b9c 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index bf2d355651..656191092d 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Bole <bole@dajmi5.com>, 2018
@@ -13,11 +13,12 @@ msgstr ""
 "PO-Revision-Date: 2018-02-16 01:44+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index cd44a13096..a959f743ab 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Bole <bole@dajmi5.com>, 2017
 msgid ""
@@ -11,12 +11,14 @@ msgstr ""
 "POT-Creation-Date: 2017-07-13 02:42+0000\n"
 "PO-Revision-Date: 2017-07-13 02:42+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
+"hr_HR/)\n"
+"Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index 76fe59701a..6051ac2ca2 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Paolo Valier <paolo.valier@hotmail.it>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index 9ef3189b0d..438e944e96 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index 384ca4ac01..bed64c883a 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-23 00:28+0000\n"
 "PO-Revision-Date: 2017-06-23 00:28+0000\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index 57f39208da..fdfd31778c 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index b4eee93e02..6a0a6a120f 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index 6002005fba..34f4b3f0d0 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Armando Vulcano Junior <vulcano@uol.com.br>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Armando Vulcano Junior <vulcano@uol.com.br>, 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index 9be87c18a2..356b37b89d 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Carla Berjano <berjano.carla@gmail.com>, 2017
@@ -12,11 +12,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-14 06:07+0000\n"
 "PO-Revision-Date: 2017-01-14 06:07+0000\n"
 "Last-Translator: Carla Berjano <berjano.carla@gmail.com>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
new file mode 100644
index 0000000000..f1e83ac4f9
--- /dev/null
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* report_qweb_pdf_watermark
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "An expression yielding the base64 encoded data to be used as watermark. \n"
+"You have access to variables `env` and `docs`"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+msgid "Demo report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_report
+msgid "Report"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+msgid "Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+msgid "Watermark expression"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index b75fa34950..fc2204a651 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
index d721393f1c..fbf622e6e7 100644
--- a/report_qweb_pdf_watermark/i18n/tr.po
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index 3ed8bbdb42..732297c1ec 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Ozge Altinisik <ozge@altinkaya.com.tr>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ozge Altinisik <ozge@altinkaya.com.tr>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
+"tr_TR/)\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: report_qweb_pdf_watermark

From 0f98e2b21b3899a38b8cdd3bf9ed42d99e5e71fa Mon Sep 17 00:00:00 2001
From: Rod Schouteden <rod.schouteden@dynapps.be>
Date: Thu, 16 Aug 2018 17:55:26 +0200
Subject: [PATCH 14/42] [MIG] report_qweb_pdf_watermark: Migration to 11.0

---
 report_qweb_pdf_watermark/README.rst          |  5 +-
 report_qweb_pdf_watermark/__init__.py         |  2 +-
 report_qweb_pdf_watermark/__manifest__.py     | 17 +++--
 report_qweb_pdf_watermark/demo/report.xml     |  8 +--
 report_qweb_pdf_watermark/i18n/ca.po          | 10 +--
 report_qweb_pdf_watermark/i18n/da.po          | 10 +--
 report_qweb_pdf_watermark/i18n/de.po          | 15 ++--
 report_qweb_pdf_watermark/i18n/el_GR.po       | 13 ++--
 report_qweb_pdf_watermark/i18n/es.po          | 15 ++--
 report_qweb_pdf_watermark/i18n/es_CO.po       | 13 ++--
 report_qweb_pdf_watermark/i18n/fr.po          | 12 ++--
 report_qweb_pdf_watermark/i18n/gl.po          | 10 +--
 report_qweb_pdf_watermark/i18n/hr.po          | 36 +++++-----
 report_qweb_pdf_watermark/i18n/hr_HR.po       | 18 +++--
 report_qweb_pdf_watermark/i18n/it.po          | 12 ++--
 report_qweb_pdf_watermark/i18n/nb_NO.po       | 13 ++--
 report_qweb_pdf_watermark/i18n/nl_NL.po       | 15 ++--
 report_qweb_pdf_watermark/i18n/pl.po          | 13 ++--
 report_qweb_pdf_watermark/i18n/pt.po          | 10 +--
 report_qweb_pdf_watermark/i18n/pt_BR.po       | 13 ++--
 report_qweb_pdf_watermark/i18n/pt_PT.po       | 15 ++--
 report_qweb_pdf_watermark/i18n/sl.po          | 13 ++--
 report_qweb_pdf_watermark/i18n/tr.po          | 12 ++--
 report_qweb_pdf_watermark/i18n/tr_TR.po       | 13 ++--
 report_qweb_pdf_watermark/models/__init__.py  |  2 -
 .../models/ir_actions_report_xml.py           | 14 ----
 report_qweb_pdf_watermark/models/report.py    | 69 ++++++++++++-------
 report_qweb_pdf_watermark/tests/__init__.py   |  1 -
 .../tests/test_report_qweb_pdf_watermark.py   | 11 ++-
 .../views/ir_actions_report_xml.xml           |  2 +-
 .../views/layout_templates.xml                |  2 +-
 31 files changed, 204 insertions(+), 210 deletions(-)
 delete mode 100644 report_qweb_pdf_watermark/models/ir_actions_report_xml.py

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 07f681b185..16c8a95d53 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -11,7 +11,9 @@ This module was written to add watermarks (backgrounds) to PDF reports. Because
 Installation
 ============
 
-This module works out of the box, but is faster if you install the python library PyPDF2.
+As PyPDF is not supported in python3, you need to install PyPDF2::
+
+$ pip install pypdf2
 
 Usage
 =====
@@ -51,6 +53,7 @@ Contributors
 
 * Holger Brunn <hbrunn@therp.nl>
 * Stefan Rijnhart <stefan@opener.am>
+* Rod Schouteden <rod.schouteden@dynapps.be>
 
 Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
 
diff --git a/report_qweb_pdf_watermark/__init__.py b/report_qweb_pdf_watermark/__init__.py
index 7eda98a232..5c170507d8 100644
--- a/report_qweb_pdf_watermark/__init__.py
+++ b/report_qweb_pdf_watermark/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 from . import models
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index f4ca0611c8..74b5ad7883 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -1,20 +1,29 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "10.0.1.0.2",
+    "version": "11.0.1.0.0",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
-    "category": "Reporting",
+    "category": "Technical Settings",
     "summary": "Add watermarks to your QWEB PDF reports",
+    "website": "https://github.com/oca/reporting-engine",
     "depends": [
-        'report',
+        'web',
     ],
     "data": [
         "demo/report.xml",
         "views/ir_actions_report_xml.xml",
         "views/layout_templates.xml",
     ],
+    "demo": [
+        "demo/report.xml"
+    ],
+    "intallable": True,
+    'external_dependencies': {
+        'python': [
+            'PyPDF2',
+        ],
+    },
 }
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
index 7528dbf9db..1e07ba613e 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -7,14 +7,14 @@
         report_type="qweb-pdf"
         name="report_qweb_pdf_watermark.demo_report_view"
         file="report_qweb_pdf_watermark.demo_report_view"
-        paperformat="report.paperformat_euro"
+        paperformat="base.paperformat_euro"
         />
-    <record id="demo_report" model="ir.actions.report.xml">
+    <record id="demo_report" model="ir.actions.report">
         <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
     </record>
     <template id="demo_report_view">
-        <t t-call="report.html_container">
-            <t t-call="report.external_layout">
+        <t t-call="web.html_container">
+            <t t-call="web.external_layout">
                 <div class="page">
                     <ul>
                         <li t-foreach="docs" t-as="doc">
diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index b4e6971225..8d0247b47a 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Carles Antoli <carlesantoli@hotmail.com>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -46,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index addddf408e..9b6d72138d 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -46,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index dfce4fd350..de29c08a4c 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-03-04 05:58+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,12 +25,11 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als "
-"Wasserzeichen, liefert.\n"
+"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als Wasserzeichen, liefert.\n"
 "Sie haben die Variablen 'env' und 'docs' zur Verfügung"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr "Beispielbericht"
 
@@ -50,6 +49,6 @@ msgid "Watermark expression"
 msgstr "Wasserzeichnen-Ausdruck"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 7c18715b0a..8a6f5fc6ca 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Kostas Goutoudis <goutoudis@gmail.com>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Kostas Goutoudis <goutoudis@gmail.com>, 2017\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
-"el_GR/)\n"
-"Language: el_GR\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index dc33655cd6..6e0e5e846d 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,12 +25,11 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Una expresión que obtenga los datos codificados en base64 a ser usada como "
-"marca de agua.\n"
+"Una expresión que obtenga los datos codificados en base64 a ser usada como marca de agua.\n"
 "Tiene acceso a las variables `env` y `docs`."
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr "Informe demo"
 
@@ -50,6 +49,6 @@ msgid "Watermark expression"
 msgstr "Expresión para la marca de agua"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index 9df7ededdb..7bb594087f 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # John Toro <johntoro@gmail.com>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: John Toro <johntoro@gmail.com>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
-"es_CO/)\n"
-"Language: es_CO\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index 5f26afaf24..63b74eacf5 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Yannick Vaucher <yannick.vaucher@camptocamp.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +47,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index 002e1e7b9c..a67d53a615 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -46,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index 656191092d..1ab83aa898 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -1,24 +1,22 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2017
-# Bole <bole@dajmi5.com>, 2018
+# Bole <bole@dajmi5.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-16 01:44+0000\n"
-"PO-Revision-Date: 2018-02-16 01:44+0000\n"
-"Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
+"POT-Creation-Date: 2017-01-10 03:40+0000\n"
+"PO-Revision-Date: 2017-01-10 03:40+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -26,30 +24,28 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Izraz koji polučuje base46 kodirane podatke koji se koriste kao vodeni žig.\n"
-"Imate pristup varijablama 'env' i 'docs'"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
-msgstr "Demo izvještaj"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_report
 msgid "Report"
-msgstr "Izvještaj"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
-msgstr "Vodeni žig"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
 msgid "Watermark expression"
-msgstr "Izraz vodenog žiga"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index a959f743ab..5650a4f8c0 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Bole <bole@dajmi5.com>, 2017
 msgid ""
@@ -11,14 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-07-13 02:42+0000\n"
 "PO-Revision-Date: 2017-07-13 02:42+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
-"hr_HR/)\n"
-"Language: hr_HR\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: hr_HR\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -30,7 +28,7 @@ msgstr ""
 "Imate pristup varijablama 'env' i 'docs'"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr "Demo izvještaj"
 
@@ -50,6 +48,6 @@ msgid "Watermark expression"
 msgstr "Izraz vodenog žiga"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index 6051ac2ca2..53f6e79917 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Paolo Valier <paolo.valier@hotmail.it>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +47,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index 438e944e96..5418d266df 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
-"teams/23907/nb_NO/)\n"
-"Language: nb_NO\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index bed64c883a..6fdd0e1aa2 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-06-23 00:28+0000\n"
 "PO-Revision-Date: 2017-06-23 00:28+0000\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
-"teams/23907/nl_NL/)\n"
-"Language: nl_NL\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index fdfd31778c..b5e1a42bb5 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,12 +12,11 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index 6a0a6a120f..7bc0d63d2d 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -46,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index 34f4b3f0d0..dce871c3fe 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Armando Vulcano Junior <vulcano@uol.com.br>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Armando Vulcano Junior <vulcano@uol.com.br>, 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
-"teams/23907/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index 356b37b89d..e3eb705ff0 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Carla Berjano <berjano.carla@gmail.com>, 2017
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-14 06:07+0000\n"
 "PO-Revision-Date: 2017-01-14 06:07+0000\n"
 "Last-Translator: Carla Berjano <berjano.carla@gmail.com>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
-"teams/23907/pt_PT/)\n"
-"Language: pt_PT\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -28,7 +27,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -48,6 +47,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index fc2204a651..6fa2a27380 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
 msgid ""
@@ -12,12 +12,11 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
index fbf622e6e7..339ec158d4 100644
--- a/report_qweb_pdf_watermark/i18n/tr.po
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -46,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
+msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index 732297c1ec..a27168e904 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-#
+# 
 # Translators:
 # Ozge Altinisik <ozge@altinkaya.com.tr>, 2017
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ozge Altinisik <ozge@altinkaya.com.tr>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
-"tr_TR/)\n"
-"Language: tr_TR\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: report_qweb_pdf_watermark
@@ -27,7 +26,7 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
@@ -47,6 +46,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+msgid "ir.actions.report"
 msgstr ""
diff --git a/report_qweb_pdf_watermark/models/__init__.py b/report_qweb_pdf_watermark/models/__init__.py
index e9e37ae5e0..76c9399650 100644
--- a/report_qweb_pdf_watermark/models/__init__.py
+++ b/report_qweb_pdf_watermark/models/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from . import ir_actions_report_xml
 from . import report
diff --git a/report_qweb_pdf_watermark/models/ir_actions_report_xml.py b/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
deleted file mode 100644
index ff2116198b..0000000000
--- a/report_qweb_pdf_watermark/models/ir_actions_report_xml.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# © 2016 Therp BV <http://therp.nl>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import fields, models
-
-
-class IrActionsReportXml(models.Model):
-    _inherit = 'ir.actions.report.xml'
-
-    pdf_watermark = fields.Binary('Watermark')
-    pdf_watermark_expression = fields.Char(
-        'Watermark expression', help='An expression yielding the base64 '
-        'encoded data to be used as watermark. \n'
-        'You have access to variables `env` and `docs`')
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index f77ed7592a..b0f5b4678a 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -1,43 +1,60 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from base64 import b64decode
 from logging import getLogger
 from PIL import Image
-from StringIO import StringIO
+from io import BytesIO
 
-from pyPdf import PdfFileWriter, PdfFileReader
-from pyPdf.utils import PdfReadError
-try:
-    from PyPDF2 import PdfFileWriter, PdfFileReader  # pylint: disable=W0404
-    from PyPDF2.utils import PdfReadError  # pylint: disable=W0404
-except ImportError:
-    pass
 try:
     # we need this to be sure PIL has loaded PDF support
     from PIL import PdfImagePlugin  # noqa: F401
 except ImportError:
     pass
-from odoo import api, models, tools
+from odoo import api, models, fields, tools
 
 logger = getLogger(__name__)
 
+try:
+    from PyPDF2 import PdfFileWriter, PdfFileReader  # pylint: disable=W0404
+    from PyPDF2.utils import PdfReadError  # pylint: disable=W0404
+except ImportError:
+    logger.debug('Can not import PyPDF2')
+
 
 class Report(models.Model):
-    _inherit = 'report'
+    _inherit = 'ir.actions.report'
+
+    pdf_watermark = fields.Binary('Watermark')
+    pdf_watermark_expression = fields.Char(
+        'Watermark expression', help='An expression yielding the base64 '
+        'encoded data to be used as watermark. \n'
+        'You have access to variables `env` and `docs`')
+
+    @api.multi
+    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(res_ids=res_ids, data=data)
+        return super(Report, self).render_qweb_pdf(res_ids=res_ids, data=data)
 
     @api.model
-    def get_pdf(self, docids, report_name, html=None, data=None):
-        result = super(Report, self).get_pdf(
-            docids, report_name, html=html, data=data)
-        report = self._get_report_from_name(report_name)
+    def _run_wkhtmltopdf(self, bodies, header=None, footer=None,
+                         landscape=False, specific_paperformat_args=None,
+                         set_viewport_size=False):
+        result = super(Report, self)._run_wkhtmltopdf(
+            bodies, header=header, footer=footer, landscape=landscape,
+            specific_paperformat_args=specific_paperformat_args,
+            set_viewport_size=set_viewport_size)
+
+        docids = self.env.context.get('res_ids', False)
         watermark = None
-        if report.pdf_watermark:
-            watermark = b64decode(report.pdf_watermark)
-        elif report.pdf_watermark_expression:
+        if self.pdf_watermark:
+            watermark = b64decode(self.pdf_watermark)
+        elif docids:
             watermark = tools.safe_eval(
-                report.pdf_watermark_expression,
-                dict(env=self.env, docs=self.env[report.model].browse(docids)),
+                self.pdf_watermark_expression or 'None',
+                dict(env=self.env, docs=self.env[self.model].browse(docids)),
             )
             if watermark:
                 watermark = b64decode(watermark)
@@ -48,17 +65,17 @@ def get_pdf(self, docids, report_name, html=None, data=None):
         pdf = PdfFileWriter()
         pdf_watermark = None
         try:
-            pdf_watermark = PdfFileReader(StringIO(watermark))
+            pdf_watermark = PdfFileReader(BytesIO(watermark))
         except PdfReadError:
             # let's see if we can convert this with pillow
             try:
                 Image.init()
-                image = Image.open(StringIO(watermark))
-                pdf_buffer = StringIO()
+                image = Image.open(BytesIO(watermark))
+                pdf_buffer = BytesIO()
                 if image.mode != 'RGB':
                     image = image.convert('RGB')
                 resolution = image.info.get(
-                    'dpi', report.paperformat_id.dpi or 90
+                    'dpi', self.paperformat_id.dpi or 90
                 )
                 if isinstance(resolution, tuple):
                     resolution = resolution[0]
@@ -80,14 +97,14 @@ def get_pdf(self, docids, report_name, html=None, data=None):
             logger.debug('Your watermark pdf contains more than one page, '
                          'all but the first one will be ignored')
 
-        for page in PdfFileReader(StringIO(result)).pages:
+        for page in PdfFileReader(BytesIO(result)).pages:
             watermark_page = pdf.addBlankPage(
                 page.mediaBox.getWidth(), page.mediaBox.getHeight()
             )
             watermark_page.mergePage(pdf_watermark.getPage(0))
             watermark_page.mergePage(page)
 
-        pdf_content = StringIO()
+        pdf_content = BytesIO()
         pdf.write(pdf_content)
 
         return pdf_content.getvalue()
diff --git a/report_qweb_pdf_watermark/tests/__init__.py b/report_qweb_pdf_watermark/tests/__init__.py
index e4637a6417..2693e767d4 100644
--- a/report_qweb_pdf_watermark/tests/__init__.py
+++ b/report_qweb_pdf_watermark/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import test_report_qweb_pdf_watermark
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 19d5196140..17bd7aa077 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
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from PIL import Image
@@ -6,6 +5,7 @@
 
 
 class TestReportQwebPdfWatermark(HttpCase):
+
     def test_report_qweb_pdf_watermark(self):
         Image.init()
         # with our image, we have three
@@ -24,8 +24,7 @@ def test_report_qweb_pdf_watermark(self):
         self._test_report_images(3)
 
     def _test_report_images(self, number):
-        pdf = self.env['report'].get_pdf(
-            self.env['res.users'].search([]).ids,
-            'report_qweb_pdf_watermark.demo_report_view',
-        )
-        self.assertEqual(pdf.count('/Subtype /Image'), number)
+        report = self.env['ir.model.data'].xmlid_to_object(
+            'report_qweb_pdf_watermark.demo_report')
+        pdf, _ = report.render_qweb_pdf(self.env['res.users'].search([]).ids)
+        self.assertEqual(pdf.count(b'/Subtype /Image'), number)
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
index 3668c4fc75..d923dbc989 100644
--- a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <record id="act_report_xml_view" model="ir.ui.view">
-        <field name="model">ir.actions.report.xml</field>
+        <field name="model">ir.actions.report</field>
         <field name="inherit_id" ref="base.act_report_xml_view" />
         <field name="arch" type="xml">
             <field name="attachment" position="after">
diff --git a/report_qweb_pdf_watermark/views/layout_templates.xml b/report_qweb_pdf_watermark/views/layout_templates.xml
index fee74c753c..a295571a8e 100644
--- a/report_qweb_pdf_watermark/views/layout_templates.xml
+++ b/report_qweb_pdf_watermark/views/layout_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <!-- Include fix for https://github.com/odoo/odoo/issues/16610 -->
-    <template id="assets_pdf" inherit_id="report.assets_pdf">
+    <template id="assets_pdf" inherit_id="web.report_assets_pdf">
         <link position="after">
             <link href="/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
                   rel="stylesheet"/>

From bab254d4fded640921cdf1ad6df06251754c4d03 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 15 Mar 2019 15:01:11 +0000
Subject: [PATCH 15/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 .../i18n/report_qweb_pdf_watermark.pot              | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
index f1e83ac4f9..097c31497d 100644
--- a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -20,15 +20,10 @@ msgid "An expression yielding the base64 encoded data to be used as watermark. \
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report.xml,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr ""
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -40,7 +35,7 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+msgid "ir.actions.report"
 msgstr ""
 

From 3cf28329a58f405f94c166114e3563a5492699f0 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sun, 17 Mar 2019 13:24:25 +0000
Subject: [PATCH 16/42] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: reporting-engine-11.0/reporting-engine-11.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-11-0/reporting-engine-11-0-report_qweb_pdf_watermark/
---
 report_qweb_pdf_watermark/i18n/ca.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/da.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/de.po    | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/el_GR.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/es.po    | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/es_CO.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/fr.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/gl.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/hr.po    | 14 +++++---------
 report_qweb_pdf_watermark/i18n/hr_HR.po | 20 ++++++++++----------
 report_qweb_pdf_watermark/i18n/it.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/nb_NO.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/nl_NL.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/pl.po    | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/pt.po    | 14 ++++++--------
 report_qweb_pdf_watermark/i18n/pt_BR.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/pt_PT.po | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/sl.po    | 17 ++++++++---------
 report_qweb_pdf_watermark/i18n/tr.po    | 11 +++--------
 report_qweb_pdf_watermark/i18n/tr_TR.po | 17 ++++++++---------
 20 files changed, 142 insertions(+), 174 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index 8d0247b47a..a5b2949587 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Carles Antoli <carlesantoli@hotmail.com>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +30,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Informe"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +41,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Informe"
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index 9b6d72138d..3c13bba16b 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +30,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Rapport"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +41,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index de29c08a4c..35fa2ed581 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-03-04 05:58+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,7 +25,8 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als Wasserzeichen, liefert.\n"
+"Ein Ausdruck der base64-geschlüsselte Daten, zur Verwendung als "
+"Wasserzeichen, liefert.\n"
 "Sie haben die Variablen 'env' und 'docs' zur Verfügung"
 
 #. module: report_qweb_pdf_watermark
@@ -33,11 +34,6 @@ msgstr ""
 msgid "Demo report"
 msgstr "Beispielbericht"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Bericht"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -49,6 +45,9 @@ msgid "Watermark expression"
 msgstr "Wasserzeichnen-Ausdruck"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Bericht"
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 8a6f5fc6ca..56a581e529 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Kostas Goutoudis <goutoudis@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Kostas Goutoudis <goutoudis@gmail.com>, 2017\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
+"el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Αναφορά"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Αναφορά"
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index 6e0e5e846d..fda250b946 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -25,7 +25,8 @@ msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
-"Una expresión que obtenga los datos codificados en base64 a ser usada como marca de agua.\n"
+"Una expresión que obtenga los datos codificados en base64 a ser usada como "
+"marca de agua.\n"
 "Tiene acceso a las variables `env` y `docs`."
 
 #. module: report_qweb_pdf_watermark
@@ -33,11 +34,6 @@ msgstr ""
 msgid "Demo report"
 msgstr "Informe demo"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Informe"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -49,6 +45,9 @@ msgid "Watermark expression"
 msgstr "Expresión para la marca de agua"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Informe"
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index 7bb594087f..fbd8135216 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # John Toro <johntoro@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: John Toro <johntoro@gmail.com>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Iforme"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Iforme"
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index 63b74eacf5..ba99e9fe40 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Yannick Vaucher <yannick.vaucher@camptocamp.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -31,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Rapport"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -47,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index a67d53a615..df29a01e80 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +30,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Informe"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +41,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Informe"
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index 1ab83aa898..9ddc145bda 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Bole <bole@dajmi5.com>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr ""
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index 5650a4f8c0..347dcf6801 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Bole <bole@dajmi5.com>, 2017
 msgid ""
@@ -11,12 +11,14 @@ msgstr ""
 "POT-Creation-Date: 2017-07-13 02:42+0000\n"
 "PO-Revision-Date: 2017-07-13 02:42+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
+"hr_HR/)\n"
+"Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -32,11 +34,6 @@ msgstr ""
 msgid "Demo report"
 msgstr "Demo izvještaj"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Izvještaj"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -48,6 +45,9 @@ msgid "Watermark expression"
 msgstr "Izraz vodenog žiga"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Izvještaj"
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index 53f6e79917..0eaa7dcc0c 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Paolo Valier <paolo.valier@hotmail.it>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -31,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Report"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -47,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Report"
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index 5418d266df..c91969599c 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Rapport"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index 6fdd0e1aa2..2b11d070c7 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-23 00:28+0000\n"
 "PO-Revision-Date: 2017-06-23 00:28+0000\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Rapport"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index b5e1a42bb5..721b053b60 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Raport"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Raport"
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index 7bc0d63d2d..5aa285f572 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +30,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Relatório"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +41,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Relatório"
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index dce871c3fe..47e8383de1 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Armando Vulcano Junior <vulcano@uol.com.br>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Armando Vulcano Junior <vulcano@uol.com.br>, 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Relatório"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Relatório"
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index e3eb705ff0..bd5ed24804 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Carla Berjano <berjano.carla@gmail.com>, 2017
@@ -12,11 +12,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-14 06:07+0000\n"
 "PO-Revision-Date: 2017-01-14 06:07+0000\n"
 "Last-Translator: Carla Berjano <berjano.carla@gmail.com>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -31,11 +32,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Relatório"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -47,6 +43,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
+
+#~ msgid "Report"
+#~ msgstr "Relatório"
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index 6fa2a27380..44144f8840 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Poročilo"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Poročilo"
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
index 339ec158d4..c5615eb760 100644
--- a/report_qweb_pdf_watermark/i18n/tr.po
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +30,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr ""
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +41,6 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index a27168e904..28048c57ca 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * report_qweb_pdf_watermark
-# 
+#
 # Translators:
 # Ozge Altinisik <ozge@altinkaya.com.tr>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
 "PO-Revision-Date: 2017-01-10 03:40+0000\n"
 "Last-Translator: Ozge Altinisik <ozge@altinkaya.com.tr>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
+"tr_TR/)\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: report_qweb_pdf_watermark
@@ -30,11 +31,6 @@ msgstr ""
 msgid "Demo report"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_report
-msgid "Report"
-msgstr "Rapor"
-
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
 msgid "Watermark"
@@ -46,6 +42,9 @@ msgid "Watermark expression"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir.actions.report
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "ir.actions.report"
 msgstr ""
+
+#~ msgid "Report"
+#~ msgstr "Rapor"

From b43282405e0ad6d5b47d7b4f88b892f02c6a33ef Mon Sep 17 00:00:00 2001
From: Robin Goots <robin.goots@dynapps.be>
Date: Mon, 18 Nov 2019 10:10:04 +0100
Subject: [PATCH 17/42] [MIG] report_qweb_pdf_watermark: Migration to 12.0

---
 report_qweb_pdf_watermark/README.rst          |  79 ++-
 report_qweb_pdf_watermark/__manifest__.py     |   2 +-
 .../readme/CONTRIBUTORS.rst                   |   4 +
 .../readme/DESCRIPTION.rst                    |   1 +
 report_qweb_pdf_watermark/readme/HISTORY.rst  |   4 +
 report_qweb_pdf_watermark/readme/INSTALL.rst  |   4 +
 report_qweb_pdf_watermark/readme/ROADMAP.rst  |   1 +
 report_qweb_pdf_watermark/readme/USAGE.rst    |   5 +
 .../static/description/index.html             | 458 ++++++++++++++++++
 .../tests/test_report_qweb_pdf_watermark.py   |  24 +-
 10 files changed, 547 insertions(+), 35 deletions(-)
 create mode 100644 report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
 create mode 100644 report_qweb_pdf_watermark/readme/DESCRIPTION.rst
 create mode 100644 report_qweb_pdf_watermark/readme/HISTORY.rst
 create mode 100644 report_qweb_pdf_watermark/readme/INSTALL.rst
 create mode 100644 report_qweb_pdf_watermark/readme/ROADMAP.rst
 create mode 100644 report_qweb_pdf_watermark/readme/USAGE.rst
 create mode 100644 report_qweb_pdf_watermark/static/description/index.html

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 16c8a95d53..2b60389eca 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -1,16 +1,41 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-
 =============
 Pdf watermark
 =============
 
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github
+    :target: https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark
+    :alt: OCA/reporting-engine
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/143/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
 This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
 
+**Table of contents**
+
+.. contents::
+   :local:
+
 Installation
 ============
 
+
 As PyPDF is not supported in python3, you need to install PyPDF2::
 
 $ pip install pypdf2
@@ -24,50 +49,58 @@ To use this module, you need to:
 #. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
 #. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
 
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-    :alt: Try me on Runbot
-    :target: https://runbot.odoo-community.org/runbot/143/8.0
+Known issues / Roadmap
+======================
 
-Known Issues
-============
 This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.
 
+Changelog
+=========
+
+12.0.1.0.0 (2019-11-18)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V12.
+
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/reporting-engine/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smashing it by providing a detailed and welcomed feedback.
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
 
 Credits
 =======
 
-Images
-------
+Authors
+~~~~~~~
 
-* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+* Therp BV
 
 Contributors
-------------
+~~~~~~~~~~~~
 
 * Holger Brunn <hbrunn@therp.nl>
 * Stefan Rijnhart <stefan@opener.am>
 * Rod Schouteden <rod.schouteden@dynapps.be>
+* Robin Goots <robin.goots@dynapps.be>
 
-Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
+Maintainers
+~~~~~~~~~~~
 
-Maintainer
-----------
+This module is maintained by the OCA.
 
 .. image:: https://odoo-community.org/logo.png
    :alt: Odoo Community Association
    :target: https://odoo-community.org
 
-This module is maintained by the OCA.
-
 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.
 
-To contribute to this module, please visit https://odoo-community.org.
+This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 74b5ad7883..9ee777f001 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..e171dddc7e
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Holger Brunn <hbrunn@therp.nl>
+* Stefan Rijnhart <stefan@opener.am>
+* Rod Schouteden <rod.schouteden@dynapps.be>
+* Robin Goots <robin.goots@dynapps.be>
diff --git a/report_qweb_pdf_watermark/readme/DESCRIPTION.rst b/report_qweb_pdf_watermark/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..31f5962e12
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst
new file mode 100644
index 0000000000..9917f68887
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+12.0.1.0.0 (2019-11-18)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V12.
diff --git a/report_qweb_pdf_watermark/readme/INSTALL.rst b/report_qweb_pdf_watermark/readme/INSTALL.rst
new file mode 100644
index 0000000000..dc11dadce7
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/INSTALL.rst
@@ -0,0 +1,4 @@
+
+As PyPDF is not supported in python3, you need to install PyPDF2::
+
+$ pip install pypdf2
diff --git a/report_qweb_pdf_watermark/readme/ROADMAP.rst b/report_qweb_pdf_watermark/readme/ROADMAP.rst
new file mode 100644
index 0000000000..22c286a808
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/ROADMAP.rst
@@ -0,0 +1 @@
+This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.
diff --git a/report_qweb_pdf_watermark/readme/USAGE.rst b/report_qweb_pdf_watermark/readme/USAGE.rst
new file mode 100644
index 0000000000..13dff9371f
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/USAGE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+#. go to your report
+#. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
+#. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
new file mode 100644
index 0000000000..46b8e75f62
--- /dev/null
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -0,0 +1,458 @@
+<?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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Pdf watermark</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="pdf-watermark">
+<h1 class="title">Pdf watermark</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id2">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id5">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id6">12.0.1.0.0 (2019-11-18)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="id7">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id8">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id9">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id10">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id11">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id2">Installation</a></h1>
+<p>As PyPDF is not supported in python3, you need to install PyPDF2:</p>
+<pre class="literal-block">
+$ pip install pypdf2
+</pre>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ol class="arabic simple">
+<li>go to your report</li>
+<li>select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you’ll have funny results</li>
+<li>You can also fill in an expression that returns the data (base64 encoded) to be used as watermark</li>
+</ol>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#id5">Changelog</a></h1>
+<div class="section" id="id1">
+<h2><a class="toc-backref" href="#id6">12.0.1.0.0 (2019-11-18)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V12.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id7">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id8">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id9">Authors</a></h2>
+<ul class="simple">
+<li>Therp BV</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id10">Contributors</a></h2>
+<ul class="simple">
+<li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
+<li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
+<li>Rod Schouteden &lt;<a class="reference external" href="mailto:rod.schouteden&#64;dynapps.be">rod.schouteden&#64;dynapps.be</a>&gt;</li>
+<li>Robin Goots &lt;<a class="reference external" href="mailto:robin.goots&#64;dynapps.be">robin.goots&#64;dynapps.be</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id11">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>
+<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>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
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 17bd7aa077..545b01cdee 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
@@ -5,26 +5,28 @@
 
 
 class TestReportQwebPdfWatermark(HttpCase):
-
     def test_report_qweb_pdf_watermark(self):
         Image.init()
         # with our image, we have three
         self._test_report_images(3)
 
-        self.env.ref('report_qweb_pdf_watermark.demo_report').write({
-            'pdf_watermark_expression': False,
-        })
+        self.env.ref("report_qweb_pdf_watermark.demo_report").write(
+            {"pdf_watermark_expression": False}
+        )
         # without, we have two
         self._test_report_images(2)
 
-        self.env.ref('report_qweb_pdf_watermark.demo_report').write({
-            'pdf_watermark': self.env.user.company_id.logo,
-        })
+        self.env.ref("report_qweb_pdf_watermark.demo_report").write(
+            {"pdf_watermark": self.env.user.company_id.logo}
+        )
         # and now we should have three again
         self._test_report_images(3)
 
     def _test_report_images(self, number):
-        report = self.env['ir.model.data'].xmlid_to_object(
-            'report_qweb_pdf_watermark.demo_report')
-        pdf, _ = report.render_qweb_pdf(self.env['res.users'].search([]).ids)
-        self.assertEqual(pdf.count(b'/Subtype /Image'), number)
+        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(
+            self.env["res.users"].search([]).ids
+        )
+        self.assertEqual(pdf.count(b"/Subtype /Image"), number)

From 15c555c338e98edd9e53b5e2af6b3e2d56ca7ded Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 9 Jan 2020 08:06:02 +0000
Subject: [PATCH 18/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 .../i18n/report_qweb_pdf_watermark.pot           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
index 097c31497d..a3e247ca6f 100644
--- a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
@@ -25,17 +25,17 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+msgid "Report Action"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
 

From f0a222c0b950e2103c43ae593da1acf23fd0193b Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Thu, 23 Jan 2020 14:09:01 +0000
Subject: [PATCH 19/42] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: reporting-engine-12.0/reporting-engine-12.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark/
---
 report_qweb_pdf_watermark/i18n/ca.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/da.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/de.po    | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/el_GR.po | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/es.po    | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/es_CO.po | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/fr.po    | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/gl.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/hr.po    | 17 ++++++++++-------
 report_qweb_pdf_watermark/i18n/hr_HR.po | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/it.po    | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/nb_NO.po | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/nl_NL.po | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/pl.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/pt.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/pt_BR.po | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/pt_PT.po | 22 ++++++++++++----------
 report_qweb_pdf_watermark/i18n/sl.po    | 21 ++++++++++-----------
 report_qweb_pdf_watermark/i18n/tr.po    | 17 ++++++++++-------
 report_qweb_pdf_watermark/i18n/tr_TR.po | 21 ++++++++++-----------
 20 files changed, 214 insertions(+), 205 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index a5b2949587..e27bee22c7 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -31,19 +31,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Informe"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Informe"
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index 3c13bba16b..fad0630e3a 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -31,19 +31,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Rapport"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index 35fa2ed581..a193c1bc7b 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -35,19 +35,21 @@ msgid "Demo report"
 msgstr "Beispielbericht"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Bericht"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr "Wasserzeichen"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Wasserzeichnen-Ausdruck"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Bericht"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 56a581e529..2c755a85e0 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Αναφορά"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Αναφορά"
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index fda250b946..b3e1b831fc 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -35,19 +35,21 @@ msgid "Demo report"
 msgstr "Informe demo"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Informe"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr "Marca de agua"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Expresión para la marca de agua"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Informe"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index fbd8135216..528cbe33a2 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Iforme"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Iforme"
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index ba99e9fe40..e6bd7eefd4 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,21 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Rapport"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index df29a01e80..a9b98f960c 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -31,19 +31,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Informe"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Informe"
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index 9ddc145bda..744b0fa2f4 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -20,7 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,16 +32,19 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+msgid "Report Action"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index 347dcf6801..eebed3bd17 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -21,7 +21,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -35,19 +35,21 @@ msgid "Demo report"
 msgstr "Demo izvještaj"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Izvještaj"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr "Vodeni žig"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Izraz vodenog žiga"
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Izvještaj"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index 0eaa7dcc0c..f4627083c4 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,21 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Report"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Report"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index c91969599c..dc7be6e3cf 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Rapport"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Rapport"
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index 2b11d070c7..7cc581b56f 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,21 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Rapport"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Rapport"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index 721b053b60..9b8fa5cb41 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -20,7 +20,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Raport"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Raport"
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index 5aa285f572..1d0a0c24c0 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -31,19 +31,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Relatório"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Relatório"
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index 47e8383de1..b23159e311 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Relatório"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Relatório"
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index bd5ed24804..46b105dd87 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -33,19 +33,21 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Relatório"
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
-
-#~ msgid "Report"
-#~ msgstr "Relatório"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index 44144f8840..c12e647639 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -20,7 +20,7 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Poročilo"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Poročilo"
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
index c5615eb760..65ce41c6ba 100644
--- a/report_qweb_pdf_watermark/i18n/tr.po
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -31,16 +31,19 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+msgid "Report Action"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
 
-#. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
-msgstr "ir.actions.report"
+#~ msgid "ir.actions.report"
+#~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index 28048c57ca..7272970f9b 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid ""
 "An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
@@ -32,19 +32,18 @@ msgid "Demo report"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark
-msgid "Watermark"
-msgstr ""
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+#, fuzzy
+#| msgid "Report"
+msgid "Report Action"
+msgstr "Rapor"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_act_report_xml_pdf_watermark_expression
-msgid "Watermark expression"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Watermark"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "ir.actions.report"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
+msgid "Watermark expression"
 msgstr ""
-
-#~ msgid "Report"
-#~ msgstr "Rapor"

From 76d3c915b661e071290461127d505645da3c6240 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sun, 16 Aug 2020 11:26:08 +0000
Subject: [PATCH 20/42] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: reporting-engine-12.0/reporting-engine-12.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark/
---
 report_qweb_pdf_watermark/i18n/ca.po    | 1 -
 report_qweb_pdf_watermark/i18n/da.po    | 1 -
 report_qweb_pdf_watermark/i18n/de.po    | 1 -
 report_qweb_pdf_watermark/i18n/el_GR.po | 1 -
 report_qweb_pdf_watermark/i18n/es.po    | 1 -
 report_qweb_pdf_watermark/i18n/es_CO.po | 1 -
 report_qweb_pdf_watermark/i18n/fr.po    | 1 -
 report_qweb_pdf_watermark/i18n/gl.po    | 1 -
 report_qweb_pdf_watermark/i18n/hr_HR.po | 1 -
 report_qweb_pdf_watermark/i18n/it.po    | 1 -
 report_qweb_pdf_watermark/i18n/nb_NO.po | 1 -
 report_qweb_pdf_watermark/i18n/nl_NL.po | 1 -
 report_qweb_pdf_watermark/i18n/pl.po    | 1 -
 report_qweb_pdf_watermark/i18n/pt.po    | 1 -
 report_qweb_pdf_watermark/i18n/pt_BR.po | 1 -
 report_qweb_pdf_watermark/i18n/pt_PT.po | 1 -
 report_qweb_pdf_watermark/i18n/sl.po    | 1 -
 report_qweb_pdf_watermark/i18n/tr_TR.po | 1 -
 18 files changed, 18 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index e27bee22c7..dd57d8ed6b 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -33,7 +33,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Informe"
 
diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index fad0630e3a..69defce901 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -33,7 +33,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Rapport"
 
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index a193c1bc7b..a1331f3caf 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -37,7 +37,6 @@ msgstr "Beispielbericht"
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Bericht"
 
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 2c755a85e0..60901f2d2a 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Αναφορά"
 
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index b3e1b831fc..05fcad4091 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -37,7 +37,6 @@ msgstr "Informe demo"
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Informe"
 
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index 528cbe33a2..9d30c3b425 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Iforme"
 
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index e6bd7eefd4..4eb7a6926d 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Rapport"
 
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index a9b98f960c..7f1d878a5e 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -33,7 +33,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Informe"
 
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index eebed3bd17..d319405a84 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -37,7 +37,6 @@ msgstr "Demo izvještaj"
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Izvještaj"
 
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index f4627083c4..8629a0da80 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Report"
 
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index dc7be6e3cf..3b927c9d06 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Rapport"
 
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index 7cc581b56f..9afc19d560 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Rapport"
 
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index 9b8fa5cb41..5a57261e11 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Raport"
 
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index 1d0a0c24c0..f2fe2def10 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -33,7 +33,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Relatório"
 
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index b23159e311..5af580d038 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Relatório"
 
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index 46b105dd87..fcc8831f70 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -35,7 +35,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Relatório"
 
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index c12e647639..8da19a87c4 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Poročilo"
 
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index 7272970f9b..f831139291 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -34,7 +34,6 @@ msgstr ""
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 #, fuzzy
-#| msgid "Report"
 msgid "Report Action"
 msgstr "Rapor"
 

From 21819d787fa2b047a8672d636560fd267120a170 Mon Sep 17 00:00:00 2001
From: Michell Stuttgart <michellstut@gmail.com>
Date: Fri, 9 Oct 2020 17:40:59 -0300
Subject: [PATCH 21/42] [FIX] Fix 'installable' syntax in manifest file

---
 report_qweb_pdf_watermark/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 9ee777f001..4b1a44a6e4 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -20,7 +20,7 @@
     "demo": [
         "demo/report.xml"
     ],
-    "intallable": True,
+    "installable": True,
     'external_dependencies': {
         'python': [
             'PyPDF2',

From 9d7d59e590007535935d1a221d6ff626b4a74d88 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 13 Oct 2020 18:30:42 +0000
Subject: [PATCH 22/42] report_qweb_pdf_watermark 12.0.1.0.1

---
 report_qweb_pdf_watermark/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 4b1a44a6e4..9c4f1d44a3 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.0.1",
     "author": "Therp BV, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",

From b637b102761e435237632f0ecd67602e5ad78bf1 Mon Sep 17 00:00:00 2001
From: fshah <foram.shah@initos.com>
Date: Thu, 28 Jan 2021 11:15:00 +0530
Subject: [PATCH 23/42] [13.0][MIG] report_qweb_pdf_watermark

---
 report_qweb_pdf_watermark/README.rst          |  6 ++
 report_qweb_pdf_watermark/__init__.py         |  2 +-
 report_qweb_pdf_watermark/__manifest__.py     | 19 ++---
 report_qweb_pdf_watermark/demo/report.xml     |  4 +-
 report_qweb_pdf_watermark/models/__init__.py  |  1 +
 report_qweb_pdf_watermark/models/report.py    | 79 +++++++++++--------
 report_qweb_pdf_watermark/tests/__init__.py   |  1 +
 .../tests/test_report_qweb_pdf_watermark.py   |  1 +
 .../views/ir_actions_report_xml.xml           | 13 ++-
 .../views/layout_templates.xml                |  8 +-
 10 files changed, 77 insertions(+), 57 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 2b60389eca..0201b08ba4 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -62,6 +62,11 @@ Changelog
 
 * [MIG] Migration to V12.
 
+13.0.1.0.0 (2021-01-27)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V13.
+
 Bug Tracker
 ===========
 
@@ -87,6 +92,7 @@ Contributors
 * Stefan Rijnhart <stefan@opener.am>
 * Rod Schouteden <rod.schouteden@dynapps.be>
 * Robin Goots <robin.goots@dynapps.be>
+* Foram Shah <foram.shah@initos.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/report_qweb_pdf_watermark/__init__.py b/report_qweb_pdf_watermark/__init__.py
index 5c170507d8..4ecaf9b238 100644
--- a/report_qweb_pdf_watermark/__init__.py
+++ b/report_qweb_pdf_watermark/__init__.py
@@ -1,4 +1,4 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import models
+from . import models  # pyflakes.ignore
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 9c4f1d44a3..c4a246d06f 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,28 +2,19 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "12.0.1.0.1",
-    "author": "Therp BV, "
-              "Odoo Community Association (OCA)",
+    "version": "13.0.1.0.0",
+    "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",
     "summary": "Add watermarks to your QWEB PDF reports",
     "website": "https://github.com/oca/reporting-engine",
-    "depends": [
-        'web',
-    ],
+    "depends": ["web"],
     "data": [
         "demo/report.xml",
         "views/ir_actions_report_xml.xml",
         "views/layout_templates.xml",
     ],
-    "demo": [
-        "demo/report.xml"
-    ],
+    "demo": ["demo/report.xml"],
     "installable": True,
-    'external_dependencies': {
-        'python': [
-            'PyPDF2',
-        ],
-    },
+    "external_dependencies": {"python": ["PyPDF2"]},
 }
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
index 1e07ba613e..df7e944d3d 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <report
         id="demo_report"
@@ -8,7 +8,7 @@
         name="report_qweb_pdf_watermark.demo_report_view"
         file="report_qweb_pdf_watermark.demo_report_view"
         paperformat="base.paperformat_euro"
-        />
+    />
     <record id="demo_report" model="ir.actions.report">
         <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
     </record>
diff --git a/report_qweb_pdf_watermark/models/__init__.py b/report_qweb_pdf_watermark/models/__init__.py
index 76c9399650..5db6f5b43c 100644
--- a/report_qweb_pdf_watermark/models/__init__.py
+++ b/report_qweb_pdf_watermark/models/__init__.py
@@ -1,3 +1,4 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 from . import report
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index b0f5b4678a..39e4e9d256 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -1,16 +1,18 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from base64 import b64decode
+from io import BytesIO
 from logging import getLogger
+
 from PIL import Image
-from io import BytesIO
+
+from odoo import api, fields, models, tools
 
 try:
     # we need this to be sure PIL has loaded PDF support
     from PIL import PdfImagePlugin  # noqa: F401
 except ImportError:
     pass
-from odoo import api, models, fields, tools
 
 logger = getLogger(__name__)
 
@@ -18,42 +20,53 @@
     from PyPDF2 import PdfFileWriter, PdfFileReader  # pylint: disable=W0404
     from PyPDF2.utils import PdfReadError  # pylint: disable=W0404
 except ImportError:
-    logger.debug('Can not import PyPDF2')
+    logger.debug("Can not import PyPDF2")
 
 
 class Report(models.Model):
-    _inherit = 'ir.actions.report'
+    _inherit = "ir.actions.report"
 
-    pdf_watermark = fields.Binary('Watermark')
+    pdf_watermark = fields.Binary("Watermark")
     pdf_watermark_expression = fields.Char(
-        'Watermark expression', help='An expression yielding the base64 '
-        'encoded data to be used as watermark. \n'
-        'You have access to variables `env` and `docs`')
+        "Watermark expression",
+        help="An expression yielding the base64 "
+        "encoded data to be used as watermark. \n"
+        "You have access to variables `env` and `docs`",
+    )
 
-    @api.multi
     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(res_ids=res_ids, data=data)
+        if not self.env.context.get("res_ids"):
+            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)
 
     @api.model
-    def _run_wkhtmltopdf(self, bodies, header=None, footer=None,
-                         landscape=False, specific_paperformat_args=None,
-                         set_viewport_size=False):
+    def _run_wkhtmltopdf(
+        self,
+        bodies,
+        header=None,
+        footer=None,
+        landscape=False,
+        specific_paperformat_args=None,
+        set_viewport_size=False,
+    ):
         result = super(Report, self)._run_wkhtmltopdf(
-            bodies, header=header, footer=footer, landscape=landscape,
+            bodies,
+            header=header,
+            footer=footer,
+            landscape=landscape,
             specific_paperformat_args=specific_paperformat_args,
-            set_viewport_size=set_viewport_size)
+            set_viewport_size=set_viewport_size,
+        )
 
-        docids = self.env.context.get('res_ids', False)
+        docids = self.env.context.get("res_ids", False)
         watermark = None
         if self.pdf_watermark:
             watermark = b64decode(self.pdf_watermark)
         elif docids:
             watermark = tools.safe_eval(
-                self.pdf_watermark_expression or 'None',
+                self.pdf_watermark_expression or "None",
                 dict(env=self.env, docs=self.env[self.model].browse(docids)),
             )
             if watermark:
@@ -72,30 +85,28 @@ def _run_wkhtmltopdf(self, bodies, header=None, footer=None,
                 Image.init()
                 image = Image.open(BytesIO(watermark))
                 pdf_buffer = BytesIO()
-                if image.mode != 'RGB':
-                    image = image.convert('RGB')
-                resolution = image.info.get(
-                    'dpi', self.paperformat_id.dpi or 90
-                )
+                if image.mode != "RGB":
+                    image = image.convert("RGB")
+                resolution = image.info.get("dpi", self.paperformat_id.dpi or 90)
                 if isinstance(resolution, tuple):
                     resolution = resolution[0]
-                image.save(pdf_buffer, 'pdf', resolution=resolution)
+                image.save(pdf_buffer, "pdf", resolution=resolution)
                 pdf_watermark = PdfFileReader(pdf_buffer)
-            except:
-                logger.exception('Failed to load watermark')
+            except Exception as e:
+                logger.exception("Failed to load watermark", e)
 
         if not pdf_watermark:
-            logger.error(
-                'No usable watermark found, got %s...', watermark[:100]
-            )
+            logger.error("No usable watermark found, got %s...", watermark[:100])
             return result
 
         if pdf_watermark.numPages < 1:
-            logger.error('Your watermark pdf does not contain any pages')
+            logger.error("Your watermark pdf does not contain any pages")
             return result
         if pdf_watermark.numPages > 1:
-            logger.debug('Your watermark pdf contains more than one page, '
-                         'all but the first one will be ignored')
+            logger.debug(
+                "Your watermark pdf contains more than one page, "
+                "all but the first one will be ignored"
+            )
 
         for page in PdfFileReader(BytesIO(result)).pages:
             watermark_page = pdf.addBlankPage(
diff --git a/report_qweb_pdf_watermark/tests/__init__.py b/report_qweb_pdf_watermark/tests/__init__.py
index 2693e767d4..1934090dee 100644
--- a/report_qweb_pdf_watermark/tests/__init__.py
+++ b/report_qweb_pdf_watermark/tests/__init__.py
@@ -1,3 +1,4 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 from . import test_report_qweb_pdf_watermark
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 545b01cdee..ce8645d29f 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
@@ -1,6 +1,7 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from PIL import Image
+
 from odoo.tests.common import HttpCase
 
 
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
index d923dbc989..fd3fbcb890 100644
--- a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -1,12 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="act_report_xml_view" model="ir.ui.view">
         <field name="model">ir.actions.report</field>
         <field name="inherit_id" ref="base.act_report_xml_view" />
         <field name="arch" type="xml">
             <field name="attachment" position="after">
-                <field name="pdf_watermark" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" />
-                <field name="pdf_watermark_expression" attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}" groups="base.group_no_one" />
+                <field
+                    name="pdf_watermark"
+                    attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}"
+                />
+                <field
+                    name="pdf_watermark_expression"
+                    attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}"
+                    groups="base.group_no_one"
+                />
             </field>
         </field>
     </record>
diff --git a/report_qweb_pdf_watermark/views/layout_templates.xml b/report_qweb_pdf_watermark/views/layout_templates.xml
index a295571a8e..50819c373d 100644
--- a/report_qweb_pdf_watermark/views/layout_templates.xml
+++ b/report_qweb_pdf_watermark/views/layout_templates.xml
@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!-- Include fix for https://github.com/odoo/odoo/issues/16610 -->
     <template id="assets_pdf" inherit_id="web.report_assets_pdf">
         <link position="after">
-            <link href="/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
-                  rel="stylesheet"/>
+            <link
+                href="/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
+                rel="stylesheet"
+            />
         </link>
     </template>
 </odoo>

From 1cbb3747ce2f5f0695be25bd7e44804b4a2dd4a0 Mon Sep 17 00:00:00 2001
From: fshah <foram.shah@initos.com>
Date: Fri, 29 Jan 2021 15:30:18 +0530
Subject: [PATCH 24/42] [IMP] report_qweb_pdf_watermark: black, isort, prettier

---
 report_qweb_pdf_watermark/__manifest__.py  | 4 ++--
 report_qweb_pdf_watermark/models/report.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index c4a246d06f..2a90a7c7ba 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,12 +2,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",
     "summary": "Add watermarks to your QWEB PDF reports",
-    "website": "https://github.com/oca/reporting-engine",
+    "website": "https://github.com/OCA/reporting-engine",
     "depends": ["web"],
     "data": [
         "demo/report.xml",
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index 39e4e9d256..8a98ca89ef 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -17,7 +17,7 @@
 logger = getLogger(__name__)
 
 try:
-    from PyPDF2 import PdfFileWriter, PdfFileReader  # pylint: disable=W0404
+    from PyPDF2 import PdfFileReader, PdfFileWriter  # pylint: disable=W0404
     from PyPDF2.utils import PdfReadError  # pylint: disable=W0404
 except ImportError:
     logger.debug("Can not import PyPDF2")

From ed0406aae12450137c405f444b698bd654173c9d Mon Sep 17 00:00:00 2001
From: fshah <foram.shah@initos.com>
Date: Fri, 29 Jan 2021 15:39:17 +0530
Subject: [PATCH 25/42] [14.0][MIG] report_qweb_pdf_watermark

---
 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 +-
 7 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 0201b08ba4..422882c6eb 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 4ecaf9b238..5c170507d8 100644
--- a/report_qweb_pdf_watermark/__init__.py
+++ b/report_qweb_pdf_watermark/__init__.py
@@ -1,4 +1,4 @@
 # © 2016 Therp BV <http://therp.nl>
 # 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 df7e944d3d..8c752c53a8 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <report
-        id="demo_report"
-        string="Demo report"
-        model="res.users"
-        report_type="qweb-pdf"
-        name="report_qweb_pdf_watermark.demo_report_view"
-        file="report_qweb_pdf_watermark.demo_report_view"
-        paperformat="base.paperformat_euro"
-    />
-    <record id="demo_report" model="ir.actions.report">
-        <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
-    </record>
-    <template id="demo_report_view">
-        <t t-call="web.html_container">
-            <t t-call="web.external_layout">
-                <div class="page">
-                    <ul>
-                        <li t-foreach="docs" t-as="doc">
-                            <t t-esc="doc.name" />
-                        </li>
-                    </ul>
-                </div>
+    <data>
+        <record id="demo_reports" model="ir.actions.report">
+            <field name="name">Demo report</field>
+            <field name="model">res.users</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">report_qweb_pdf_watermark.demo_report_view</field>
+            <field name="report_file">report_qweb_pdf_watermark.demo_report_view</field>
+            <field name="paperformat_id" ref="base.paperformat_euro" />
+            <field name="binding_model_id" ref="base.model_res_users" />
+            <field name="binding_type">report</field>
+        </record>
+        <record id="demo_report" model="ir.actions.report">
+            <field name="name">Demo report</field>
+            <field name="model">res.users</field>
+            <field name="report_name">report_qweb_pdf_watermark.demo_report_view</field>
+            <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
+        </record>
+        <template id="demo_report_view">
+            <t t-call="web.html_container">
+                <t t-call="web.external_layout">
+                    <div class="page">
+                        <ul>
+                            <li t-foreach="docs" t-as="doc">
+                                <t t-esc="doc.name" />
+                            </li>
+                        </ul>
+                    </div>
+                </t>
             </t>
-        </t>
-    </template>
+        </template>
+    </data>
 </odoo>
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index 8a98ca89ef..9362d13daf 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -6,7 +6,8 @@
 
 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 @@ def _run_wkhtmltopdf(
         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 e171dddc7e..475c9d681b 100644
--- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Stefan Rijnhart <stefan@opener.am>
 * Rod Schouteden <rod.schouteden@dynapps.be>
 * Robin Goots <robin.goots@dynapps.be>
+* Foram Shah <foram.shah@initos.com>
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst
index 9917f68887..2368540674 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 ce8645d29f..0ad4beba4f 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 @@ def _test_report_images(self, number):
         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)

From a6707a103302267636f9dd9ebe3e524b1c6e9e8d Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Wed, 14 Apr 2021 14:02:43 +0000
Subject: [PATCH 26/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 .../i18n/report_qweb_pdf_watermark.pot        | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
index a3e247ca6f..b93d14d399 100644
--- a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* report_qweb_pdf_watermark
+# 	* report_qweb_pdf_watermark
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,15 +15,32 @@ msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
-msgid "An expression yielding the base64 encoded data to be used as watermark. \n"
+msgid ""
+"An expression yielding the base64 encoded data to be used as watermark. \n"
 "You have access to variables `env` and `docs`"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_reports
 msgid "Demo report"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__id
+msgid "ID"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
 msgid "Report Action"
@@ -38,4 +55,3 @@ msgstr ""
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr ""
-

From fb12c8a3b3eeca3f18fc1ff97bf397f1e589a6e8 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 14 Apr 2021 15:05:19 +0000
Subject: [PATCH 27/42] [UPD] README.rst

---
 report_qweb_pdf_watermark/README.rst          | 12 ++--
 .../static/description/index.html             | 61 ++++++++++++-------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 422882c6eb..6b470d0429 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -14,13 +14,13 @@ Pdf watermark
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github
-    :target: https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark
+    :target: https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark
     :alt: OCA/reporting-engine
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark
+    :target: https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_qweb_pdf_watermark
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/143/12.0
+    :target: https://runbot.odoo-community.org/runbot/143/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -62,11 +62,13 @@ Changelog
 
 * [MIG] Migration to V12.
 
+
 13.0.1.0.0 (2021-01-27)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 * [MIG] Migration to V13.
 
+
 14.0.1.0.0 (2021-01-29)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -78,7 +80,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -112,6 +114,6 @@ 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.
 
-This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark>`_ project on GitHub.
+This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index 46b8e75f62..c6614ec98b 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -367,36 +367,38 @@ <h1 class="title">Pdf watermark</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id2">Installation</a></li>
-<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="id5">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id6">12.0.1.0.0 (2019-11-18)</a></li>
+<li><a class="reference internal" href="#installation" id="id4">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id5">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id6">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id7">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id8">12.0.1.0.0 (2019-11-18)</a></li>
+<li><a class="reference internal" href="#id2" id="id9">13.0.1.0.0 (2021-01-27)</a></li>
+<li><a class="reference internal" href="#id3" id="id10">14.0.1.0.0 (2021-01-29)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id7">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id8">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id9">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id10">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id11">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id11">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id12">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id13">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id14">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id15">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id2">Installation</a></h1>
+<h1><a class="toc-backref" href="#id4">Installation</a></h1>
 <p>As PyPDF is not supported in python3, you need to install PyPDF2:</p>
 <pre class="literal-block">
 $ pip install pypdf2
 </pre>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<h1><a class="toc-backref" href="#id5">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>go to your report</li>
@@ -405,51 +407,64 @@ <h1><a class="toc-backref" href="#id3">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id6">Known issues / Roadmap</a></h1>
 <p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id5">Changelog</a></h1>
+<h1><a class="toc-backref" href="#id7">Changelog</a></h1>
 <div class="section" id="id1">
-<h2><a class="toc-backref" href="#id6">12.0.1.0.0 (2019-11-18)</a></h2>
+<h2><a class="toc-backref" href="#id8">12.0.1.0.0 (2019-11-18)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V12.</li>
 </ul>
 </div>
+<div class="section" id="id2">
+<h2><a class="toc-backref" href="#id9">13.0.1.0.0 (2021-01-27)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V13.</li>
+</ul>
+</div>
+<div class="section" id="id3">
+<h2><a class="toc-backref" href="#id10">14.0.1.0.0 (2021-01-29)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V14.</li>
+</ul>
+</div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id7">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id11">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id8">Credits</a></h1>
+<h1><a class="toc-backref" href="#id12">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id9">Authors</a></h2>
+<h2><a class="toc-backref" href="#id13">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id10">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id14">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
 <li>Rod Schouteden &lt;<a class="reference external" href="mailto:rod.schouteden&#64;dynapps.be">rod.schouteden&#64;dynapps.be</a>&gt;</li>
 <li>Robin Goots &lt;<a class="reference external" href="mailto:robin.goots&#64;dynapps.be">robin.goots&#64;dynapps.be</a>&gt;</li>
+<li>Foram Shah &lt;<a class="reference external" href="mailto:foram.shah&#64;initos.com">foram.shah&#64;initos.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id11">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id15">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>
 <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>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/12.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 21d62e6b43471ce9fabc1e5ef3117585787e9cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernanda=20Hern=C3=A1ndez?= <fernanda@vauxoo.com>
Date: Wed, 1 Jun 2022 21:25:58 +0000
Subject: [PATCH 28/42] [REF] report_qweb_pdf_watermark: remove PyPDF2 from
 external_dependencies

---
 report_qweb_pdf_watermark/__manifest__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 2a90a7c7ba..c70b80ee19 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -16,5 +16,4 @@
     ],
     "demo": ["demo/report.xml"],
     "installable": True,
-    "external_dependencies": {"python": ["PyPDF2"]},
 }

From 80a891ef5fd78a0457270a17952ec15524d2e262 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 1 Jun 2022 21:50:52 +0000
Subject: [PATCH 29/42] report_qweb_pdf_watermark 14.0.1.0.1

---
 report_qweb_pdf_watermark/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index c70b80ee19..1d3af3261e 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",

From 89240a1d06b08a1b2f401e478e42eed7a3f09d2a Mon Sep 17 00:00:00 2001
From: bosd <c5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me>
Date: Tue, 1 Nov 2022 07:52:12 +0100
Subject: [PATCH 30/42] [MIG] report_qweb_pdf_watermark: Migration to 15.0

[MIG] report_qweb_pdf_watermark: Migration to 15.0
---
 report_qweb_pdf_watermark/__manifest__.py     | 10 ++++--
 report_qweb_pdf_watermark/demo/report.xml     | 13 ++-----
 report_qweb_pdf_watermark/models/__init__.py  |  1 +
 report_qweb_pdf_watermark/models/report.py    | 35 +++++++++++++------
 .../models/res_company.py                     | 10 ++++++
 .../readme/CONTRIBUTORS.rst                   |  1 +
 report_qweb_pdf_watermark/readme/HISTORY.rst  |  7 ++++
 report_qweb_pdf_watermark/readme/USAGE.rst    | 15 ++++++++
 .../tests/test_report_qweb_pdf_watermark.py   | 28 +++++++++++++--
 .../views/ir_actions_report_xml.xml           |  9 +++--
 .../views/layout_templates.xml                | 12 -------
 .../views/res_company.xml                     | 20 +++++++++++
 12 files changed, 121 insertions(+), 40 deletions(-)
 create mode 100644 report_qweb_pdf_watermark/models/res_company.py
 delete mode 100644 report_qweb_pdf_watermark/views/layout_templates.xml
 create mode 100644 report_qweb_pdf_watermark/views/res_company.xml

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 1d3af3261e..0291a07362 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,18 +2,24 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "14.0.1.0.1",
+    "version": "15.0.1.0.0",
     "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",
+    "development_status": "Production/Stable",
     "summary": "Add watermarks to your QWEB PDF reports",
     "website": "https://github.com/OCA/reporting-engine",
     "depends": ["web"],
     "data": [
         "demo/report.xml",
         "views/ir_actions_report_xml.xml",
-        "views/layout_templates.xml",
+        "views/res_company.xml",
     ],
+    "assets": {
+        "web.report_assets_pdf": [
+            "/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
+        ],
+    },
     "demo": ["demo/report.xml"],
     "installable": True,
 }
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
index 8c752c53a8..9e58bd395a 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
-        <record id="demo_reports" model="ir.actions.report">
-            <field name="name">Demo report</field>
+        <record id="demo_report" model="ir.actions.report">
+            <field name="name">Watermark Demo report</field>
             <field name="model">res.users</field>
             <field name="report_type">qweb-pdf</field>
             <field name="report_name">report_qweb_pdf_watermark.demo_report_view</field>
             <field name="report_file">report_qweb_pdf_watermark.demo_report_view</field>
             <field name="paperformat_id" ref="base.paperformat_euro" />
+            <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
             <field name="binding_model_id" ref="base.model_res_users" />
             <field name="binding_type">report</field>
         </record>
-        <record id="demo_report" model="ir.actions.report">
-            <field name="name">Demo report</field>
-            <field name="model">res.users</field>
-            <field name="report_name">report_qweb_pdf_watermark.demo_report_view</field>
-            <field name="pdf_watermark_expression">docs[:1].company_id.logo</field>
-        </record>
         <template id="demo_report_view">
             <t t-call="web.html_container">
                 <t t-call="web.external_layout">
@@ -30,5 +24,4 @@
                 </t>
             </t>
         </template>
-    </data>
 </odoo>
diff --git a/report_qweb_pdf_watermark/models/__init__.py b/report_qweb_pdf_watermark/models/__init__.py
index 5db6f5b43c..a305da9003 100644
--- a/report_qweb_pdf_watermark/models/__init__.py
+++ b/report_qweb_pdf_watermark/models/__init__.py
@@ -1,4 +1,5 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+from . import res_company
 from . import report
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index 9362d13daf..b5845228c4 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -9,13 +9,13 @@
 from odoo import api, fields, models
 from odoo.tools.safe_eval import safe_eval
 
+logger = getLogger(__name__)
+
 try:
     # we need this to be sure PIL has loaded PDF support
     from PIL import PdfImagePlugin  # noqa: F401
 except ImportError:
-    pass
-
-logger = getLogger(__name__)
+    logger.error("ImportError: The PdfImagePlugin could not be imported")
 
 try:
     from PyPDF2 import PdfFileReader, PdfFileWriter  # pylint: disable=W0404
@@ -27,7 +27,13 @@
 class Report(models.Model):
     _inherit = "ir.actions.report"
 
-    pdf_watermark = fields.Binary("Watermark")
+    use_company_watermark = fields.Boolean(
+        default=False,
+        help="Use the pdf watermark defined globally in the company settings.",
+    )
+    pdf_watermark = fields.Binary(
+        "Watermark", help="Upload an pdf file to use as an watermark on this report."
+    )
     pdf_watermark_expression = fields.Char(
         "Watermark expression",
         help="An expression yielding the base64 "
@@ -42,6 +48,17 @@ def _render_qweb_pdf(self, res_ids=None, data=None):
             )
         return super(Report, self)._render_qweb_pdf(res_ids=res_ids, data=data)
 
+    def pdf_has_usable_pages(self, numpages):
+        if numpages < 1:
+            logger.error("Your watermark pdf does not contain any pages")
+            return False
+        if numpages > 1:
+            logger.debug(
+                "Your watermark pdf contains more than one page, "
+                "all but the first one will be ignored"
+            )
+        return True
+
     @api.model
     def _run_wkhtmltopdf(
         self,
@@ -65,6 +82,8 @@ def _run_wkhtmltopdf(
         watermark = None
         if self.pdf_watermark:
             watermark = b64decode(self.pdf_watermark)
+        elif self.use_company_watermark and self.env.company.pdf_watermark:
+            watermark = b64decode(self.env.company.pdf_watermark)
         elif docids:
             watermark = safe_eval(
                 self.pdf_watermark_expression or "None",
@@ -100,14 +119,8 @@ def _run_wkhtmltopdf(
             logger.error("No usable watermark found, got %s...", watermark[:100])
             return result
 
-        if pdf_watermark.numPages < 1:
-            logger.error("Your watermark pdf does not contain any pages")
+        if not self.pdf_has_usable_pages(pdf_watermark.numPages):
             return result
-        if pdf_watermark.numPages > 1:
-            logger.debug(
-                "Your watermark pdf contains more than one page, "
-                "all but the first one will be ignored"
-            )
 
         for page in PdfFileReader(BytesIO(result)).pages:
             watermark_page = pdf.addBlankPage(
diff --git a/report_qweb_pdf_watermark/models/res_company.py b/report_qweb_pdf_watermark/models/res_company.py
new file mode 100644
index 0000000000..a7bbf87f17
--- /dev/null
+++ b/report_qweb_pdf_watermark/models/res_company.py
@@ -0,0 +1,10 @@
+# Copyright 2022 360 ERP (<https://www.360erp.nl>)
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    pdf_watermark = fields.Binary("Watermark")
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
index 475c9d681b..ccce2bb448 100644
--- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
@@ -3,3 +3,4 @@
 * Rod Schouteden <rod.schouteden@dynapps.be>
 * Robin Goots <robin.goots@dynapps.be>
 * Foram Shah <foram.shah@initos.com>
+* Emiel van Bokhoven <emiel@360erp.nl>
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst
index 2368540674..a87254f693 100644
--- a/report_qweb_pdf_watermark/readme/HISTORY.rst
+++ b/report_qweb_pdf_watermark/readme/HISTORY.rst
@@ -14,3 +14,10 @@
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 * [MIG] Migration to V14.
+
+
+15.0.1.0.0 (2022-01-11)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V15.
+* Define pdf watermark in company settings
diff --git a/report_qweb_pdf_watermark/readme/USAGE.rst b/report_qweb_pdf_watermark/readme/USAGE.rst
index 13dff9371f..a725032f19 100644
--- a/report_qweb_pdf_watermark/readme/USAGE.rst
+++ b/report_qweb_pdf_watermark/readme/USAGE.rst
@@ -3,3 +3,18 @@ To use this module, you need to:
 #. go to your report
 #. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
 #. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
+
+To use the Company watermark, you need to:
+
+#. go to settings --> company --> update info
+#. upload an pdf watermark
+#. go to settings --> technical --> reporting --> reports
+#. Select the report where you want to use it.
+#. On the 'Advanced Properties' tab of the notebook check 'use company watermark'
+
+### Demo
+And demo report is available (if you have demo data installed) on the users form view.
+
+#. go to Configuration --> users
+#. Select an users
+#. Click the print button --> Watermark Demo report.
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 0ad4beba4f..68d3fd8ad0 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
@@ -23,11 +23,33 @@ def test_report_qweb_pdf_watermark(self):
         # and now we should have three again
         self._test_report_images(3)
 
-    def _test_report_images(self, number):
-        report = self.env["ir.model.data"].xmlid_to_object(
-            "report_qweb_pdf_watermark.demo_report"
+        # test use company watermark
+        self.env.ref("report_qweb_pdf_watermark.demo_report").write(
+            {"pdf_watermark": False}
+        )
+        self.env.ref("report_qweb_pdf_watermark.demo_report").write(
+            {"use_company_watermark": True}
+        )
+        self.env.ref("base.main_company").write(
+            {"pdf_watermark": self.env.user.company_id.logo}
         )
+        self._test_report_images(3)
+
+    def _test_report_images(self, number):
+        report = self.env.ref("report_qweb_pdf_watermark.demo_report")
         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)
+
+    def test_pdf_has_usable_pages(self):
+        # test 0
+        numpages = 0
+        # pdf_has_usable_pages(self, pdf_watermark)
+        self.assertFalse(self.env["ir.actions.report"].pdf_has_usable_pages(numpages))
+        # test 1
+        numpages = 1
+        self.assertTrue(self.env["ir.actions.report"].pdf_has_usable_pages(numpages))
+        # test 2
+        numpages = 2
+        self.assertTrue(self.env["ir.actions.report"].pdf_has_usable_pages(numpages))
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
index fd3fbcb890..98b493f2b8 100644
--- a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -6,14 +6,19 @@
         <field name="arch" type="xml">
             <field name="attachment" position="after">
                 <field
-                    name="pdf_watermark"
+                    name="use_company_watermark"
                     attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}"
                 />
                 <field
                     name="pdf_watermark_expression"
-                    attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}"
+                    attrs="{'invisible': ['|',('report_type', '!=', 'qweb-pdf'),('use_company_watermark', '=', True)]}"
                     groups="base.group_no_one"
                 />
+                <field
+                    name="pdf_watermark"
+                    attrs="{'invisible': ['|',('report_type', '!=', 'qweb-pdf'),('use_company_watermark', '=', True)]}"
+                    widget="pdf_viewer"
+                />
             </field>
         </field>
     </record>
diff --git a/report_qweb_pdf_watermark/views/layout_templates.xml b/report_qweb_pdf_watermark/views/layout_templates.xml
deleted file mode 100644
index 50819c373d..0000000000
--- a/report_qweb_pdf_watermark/views/layout_templates.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <!-- Include fix for https://github.com/odoo/odoo/issues/16610 -->
-    <template id="assets_pdf" inherit_id="web.report_assets_pdf">
-        <link position="after">
-            <link
-                href="/report_qweb_pdf_watermark/static/src/css/report_qweb_pdf_watermark.css"
-                rel="stylesheet"
-            />
-        </link>
-    </template>
-</odoo>
diff --git a/report_qweb_pdf_watermark/views/res_company.xml b/report_qweb_pdf_watermark/views/res_company.xml
new file mode 100644
index 0000000000..66a55d4876
--- /dev/null
+++ b/report_qweb_pdf_watermark/views/res_company.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_company_form" model="ir.ui.view">
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//field[@name='currency_id']" position="after">
+                <field
+                    name="pdf_watermark"
+                    widget="pdf_viewer"
+                    help="Upload an pdf file to use as an Company watermark. You need to activate the setting 'use company watermark' on the reports where you want to use it."
+                />
+            </xpath>
+
+        </field>
+    </record>
+
+</odoo>

From 004277368729c5b97a5596d1ad71c68471484520 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Thu, 29 Dec 2022 08:56:50 +0000
Subject: [PATCH 31/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 .../i18n/report_qweb_pdf_watermark.pot        | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
index b93d14d399..c89bc2481c 100644
--- a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -21,36 +21,48 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_reports
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__display_name
-msgid "Display Name"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
+msgid "Report Action"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__id
-msgid "ID"
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report____last_update
-msgid "Last Modified on"
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-msgid "Report Action"
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"

From cad82a9d3465efa52405da1235f15e7151f5c228 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 29 Dec 2022 08:59:48 +0000
Subject: [PATCH 32/42] [UPD] README.rst

---
 report_qweb_pdf_watermark/README.rst          | 37 +++++++--
 .../static/description/index.html             | 78 ++++++++++++-------
 2 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 6b470d0429..4cf05573c0 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -7,20 +7,20 @@ Pdf watermark
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Production/Stable
 .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github
-    :target: https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark
+    :target: https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark
     :alt: OCA/reporting-engine
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_qweb_pdf_watermark
+    :target: https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/143/14.0
+    :target: https://runbot.odoo-community.org/runbot/143/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -49,6 +49,21 @@ To use this module, you need to:
 #. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
 #. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
 
+To use the Company watermark, you need to:
+
+#. go to settings --> company --> update info
+#. upload an pdf watermark
+#. go to settings --> technical --> reporting --> reports
+#. Select the report where you want to use it.
+#. On the 'Advanced Properties' tab of the notebook check 'use company watermark'
+
+### Demo
+And demo report is available (if you have demo data installed) on the users form view.
+
+#. go to Configuration --> users
+#. Select an users
+#. Click the print button --> Watermark Demo report.
+
 Known issues / Roadmap
 ======================
 
@@ -74,13 +89,20 @@ Changelog
 
 * [MIG] Migration to V14.
 
+
+15.0.1.0.0 (2022-01-11)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V15.
+* Define pdf watermark in company settings
+
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -100,6 +122,7 @@ Contributors
 * Rod Schouteden <rod.schouteden@dynapps.be>
 * Robin Goots <robin.goots@dynapps.be>
 * Foram Shah <foram.shah@initos.com>
+* Emiel van Bokhoven <emiel@360erp.nl>
 
 Maintainers
 ~~~~~~~~~~~
@@ -114,6 +137,6 @@ 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.
 
-This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark>`_ project on GitHub.
+This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index c6614ec98b..7e60ebb217 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -367,104 +367,128 @@ <h1 class="title">Pdf watermark</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id4">Installation</a></li>
-<li><a class="reference internal" href="#usage" id="id5">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id6">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="id7">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id8">12.0.1.0.0 (2019-11-18)</a></li>
-<li><a class="reference internal" href="#id2" id="id9">13.0.1.0.0 (2021-01-27)</a></li>
-<li><a class="reference internal" href="#id3" id="id10">14.0.1.0.0 (2021-01-29)</a></li>
+<li><a class="reference internal" href="#installation" id="id5">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id6">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id7">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id8">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id9">12.0.1.0.0 (2019-11-18)</a></li>
+<li><a class="reference internal" href="#id2" id="id10">13.0.1.0.0 (2021-01-27)</a></li>
+<li><a class="reference internal" href="#id3" id="id11">14.0.1.0.0 (2021-01-29)</a></li>
+<li><a class="reference internal" href="#id4" id="id12">15.0.1.0.0 (2022-01-11)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id11">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id12">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id13">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id14">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id15">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id13">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id14">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id15">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id16">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id17">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id4">Installation</a></h1>
+<h1><a class="toc-backref" href="#id5">Installation</a></h1>
 <p>As PyPDF is not supported in python3, you need to install PyPDF2:</p>
 <pre class="literal-block">
 $ pip install pypdf2
 </pre>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id5">Usage</a></h1>
+<h1><a class="toc-backref" href="#id6">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>go to your report</li>
 <li>select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you’ll have funny results</li>
 <li>You can also fill in an expression that returns the data (base64 encoded) to be used as watermark</li>
 </ol>
+<p>To use the Company watermark, you need to:</p>
+<ol class="arabic simple">
+<li>go to settings –&gt; company –&gt; update info</li>
+<li>upload an pdf watermark</li>
+<li>go to settings –&gt; technical –&gt; reporting –&gt; reports</li>
+<li>Select the report where you want to use it.</li>
+<li>On the ‘Advanced Properties’ tab of the notebook check ‘use company watermark’</li>
+</ol>
+<p>### Demo
+And demo report is available (if you have demo data installed) on the users form view.</p>
+<ol class="arabic simple">
+<li>go to Configuration –&gt; users</li>
+<li>Select an users</li>
+<li>Click the print button –&gt; Watermark Demo report.</li>
+</ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id6">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id7">Known issues / Roadmap</a></h1>
 <p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id7">Changelog</a></h1>
+<h1><a class="toc-backref" href="#id8">Changelog</a></h1>
 <div class="section" id="id1">
-<h2><a class="toc-backref" href="#id8">12.0.1.0.0 (2019-11-18)</a></h2>
+<h2><a class="toc-backref" href="#id9">12.0.1.0.0 (2019-11-18)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V12.</li>
 </ul>
 </div>
 <div class="section" id="id2">
-<h2><a class="toc-backref" href="#id9">13.0.1.0.0 (2021-01-27)</a></h2>
+<h2><a class="toc-backref" href="#id10">13.0.1.0.0 (2021-01-27)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V13.</li>
 </ul>
 </div>
 <div class="section" id="id3">
-<h2><a class="toc-backref" href="#id10">14.0.1.0.0 (2021-01-29)</a></h2>
+<h2><a class="toc-backref" href="#id11">14.0.1.0.0 (2021-01-29)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V14.</li>
 </ul>
 </div>
+<div class="section" id="id4">
+<h2><a class="toc-backref" href="#id12">15.0.1.0.0 (2022-01-11)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V15.</li>
+<li>Define pdf watermark in company settings</li>
+</ul>
+</div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id11">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id13">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id12">Credits</a></h1>
+<h1><a class="toc-backref" href="#id14">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id13">Authors</a></h2>
+<h2><a class="toc-backref" href="#id15">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id14">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id16">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
 <li>Rod Schouteden &lt;<a class="reference external" href="mailto:rod.schouteden&#64;dynapps.be">rod.schouteden&#64;dynapps.be</a>&gt;</li>
 <li>Robin Goots &lt;<a class="reference external" href="mailto:robin.goots&#64;dynapps.be">robin.goots&#64;dynapps.be</a>&gt;</li>
 <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>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id15">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id17">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>
 <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>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/14.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 7fd628ac9cd64f27aa6302f141a3af4d8c4bb93f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 29 Dec 2022 12:08:01 +0000
Subject: [PATCH 33/42] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: reporting-engine-15.0/reporting-engine-15.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark/
---
 report_qweb_pdf_watermark/i18n/ca.po | 32 ++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/ca.po b/report_qweb_pdf_watermark/i18n/ca.po
index dd57d8ed6b..c48d2ec762 100644
--- a/report_qweb_pdf_watermark/i18n/ca.po
+++ b/report_qweb_pdf_watermark/i18n/ca.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -36,11 +36,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Informe"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"

From 4e7610fc713027d483a7385fdae0095a36a85b2b Mon Sep 17 00:00:00 2001
From: "anjeel.haria" <anjeel.haria@brainvire.com>
Date: Mon, 13 Mar 2023 15:11:27 +0100
Subject: [PATCH 34/42] [MIG] report_qweb_pdf_watermark: Migration to 16.0

Syntax Fixes
---
 report_qweb_pdf_watermark/__manifest__.py     |  2 +-
 report_qweb_pdf_watermark/models/report.py    | 29 ++++++++++++++-----
 .../readme/CONTRIBUTORS.rst                   |  1 +
 report_qweb_pdf_watermark/readme/HISTORY.rst  |  5 ++++
 .../static/description/index.html             | 22 +++++++++-----
 .../tests/test_report_qweb_pdf_watermark.py   | 11 +++++--
 6 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 0291a07362..26b350f8db 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index b5845228c4..b48516933d 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -1,4 +1,5 @@
 # © 2016 Therp BV <http://therp.nl>
+# Copyright 2023 Onestein - Anjeel Haria
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from base64 import b64decode
 from io import BytesIO
@@ -41,12 +42,14 @@ 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, report_ref, 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(
-                res_ids=res_ids, data=data
+                report_ref, 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(
+            report_ref, res_ids=res_ids, data=data
+        )
 
     def pdf_has_usable_pages(self, numpages):
         if numpages < 1:
@@ -63,6 +66,7 @@ def pdf_has_usable_pages(self, numpages):
     def _run_wkhtmltopdf(
         self,
         bodies,
+        report_ref=False,
         header=None,
         footer=None,
         landscape=False,
@@ -71,6 +75,7 @@ def _run_wkhtmltopdf(
     ):
         result = super(Report, self)._run_wkhtmltopdf(
             bodies,
+            report_ref=report_ref,
             header=header,
             footer=footer,
             landscape=landscape,
@@ -79,15 +84,23 @@ def _run_wkhtmltopdf(
         )
 
         docids = self.env.context.get("res_ids", False)
+        report_sudo = self._get_report(report_ref)
         watermark = None
-        if self.pdf_watermark:
-            watermark = b64decode(self.pdf_watermark)
-        elif self.use_company_watermark and self.env.company.pdf_watermark:
+        if self.pdf_watermark or report_sudo.pdf_watermark:
+            watermark = b64decode(self.pdf_watermark or report_sudo.pdf_watermark)
+        elif (
+            self.use_company_watermark or report_sudo.use_company_watermark
+        ) and self.env.company.pdf_watermark:
             watermark = b64decode(self.env.company.pdf_watermark)
         elif docids:
             watermark = safe_eval(
-                self.pdf_watermark_expression or "None",
-                dict(env=self.env, docs=self.env[self.model].browse(docids)),
+                self.pdf_watermark_expression
+                or report_sudo.pdf_watermark_expression
+                or "None",
+                dict(
+                    env=self.env,
+                    docs=self.env[self.model or report_sudo.model].browse(docids),
+                ),
             )
             if watermark:
                 watermark = b64decode(watermark)
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
index ccce2bb448..cd5afe984e 100644
--- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
@@ -4,3 +4,4 @@
 * Robin Goots <robin.goots@dynapps.be>
 * Foram Shah <foram.shah@initos.com>
 * Emiel van Bokhoven <emiel@360erp.nl>
+* Anjeel Haria
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst
index a87254f693..caf0c913c8 100644
--- a/report_qweb_pdf_watermark/readme/HISTORY.rst
+++ b/report_qweb_pdf_watermark/readme/HISTORY.rst
@@ -21,3 +21,8 @@
 
 * [MIG] Migration to V15.
 * Define pdf watermark in company settings
+
+16.0.1.0.0 (2023-03-13)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V16.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index 7e60ebb217..eabbdb4dd5 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Pdf watermark</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -380,13 +380,14 @@ <h1 class="title">Pdf watermark</h1>
 <li><a class="reference internal" href="#id2" id="id10">13.0.1.0.0 (2021-01-27)</a></li>
 <li><a class="reference internal" href="#id3" id="id11">14.0.1.0.0 (2021-01-29)</a></li>
 <li><a class="reference internal" href="#id4" id="id12">15.0.1.0.0 (2022-01-11)</a></li>
+<li><a class="reference internal" href="#id4" id="id13">16.0.1.0.0 (2023-03-13)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id13">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id14">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id15">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id16">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id17">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id14">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id15">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id16">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id17">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id18">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -453,6 +454,12 @@ <h2><a class="toc-backref" href="#id12">15.0.1.0.0 (2022-01-11)</a></h2>
 <li>Define pdf watermark in company settings</li>
 </ul>
 </div>
+<div class="section" id="id19">
+<h2><a class="toc-backref" href="#id11">16.0.1.0.0 (2023-03-13)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V16.</li>
+</ul>
+</div>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#id13">Bug Tracker</a></h1>
@@ -479,6 +486,7 @@ <h2><a class="toc-backref" href="#id16">Contributors</a></h2>
 <li>Robin Goots &lt;<a class="reference external" href="mailto:robin.goots&#64;dynapps.be">robin.goots&#64;dynapps.be</a>&gt;</li>
 <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>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -488,7 +496,7 @@ <h2><a class="toc-backref" href="#id17">Maintainers</a></h2>
 <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>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
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 68d3fd8ad0..4eb66cd96a 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
@@ -1,4 +1,5 @@
 # © 2016 Therp BV <http://therp.nl>
+# Copyright 2023 Onestein - Anjeel Haria
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from PIL import Image
 
@@ -36,9 +37,13 @@ def test_report_qweb_pdf_watermark(self):
         self._test_report_images(3)
 
     def _test_report_images(self, number):
-        report = self.env.ref("report_qweb_pdf_watermark.demo_report")
-        pdf, _ = report.with_context(force_report_rendering=True)._render_qweb_pdf(
-            self.env["res.users"].search([]).ids
+        pdf, _ = (
+            self.env["ir.actions.report"]
+            .with_context(force_report_rendering=True)
+            ._render_qweb_pdf(
+                "report_qweb_pdf_watermark.demo_report",
+                self.env["res.users"].search([]).ids,
+            )
         )
         self.assertEqual(pdf.count(b"/Subtype /Image"), number)
 

From 9b3202f1b9062e3053f6c256398dd17a3565554a Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Tue, 4 Apr 2023 17:47:25 +0000
Subject: [PATCH 35/42] [UPD] Update report_qweb_pdf_watermark.pot

---
 report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
index c89bc2481c..fdf632e4d2 100644
--- a/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
+++ b/report_qweb_pdf_watermark/i18n/report_qweb_pdf_watermark.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

From 7968bbd12385882bab0ad1a4103b6728681bac75 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 4 Apr 2023 17:50:04 +0000
Subject: [PATCH 36/42] [UPD] README.rst

---
 report_qweb_pdf_watermark/README.rst          | 16 +++--
 .../static/description/index.html             | 62 +++++++++----------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index 4cf05573c0..fdb2f47cef 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -14,13 +14,13 @@ Pdf watermark
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github
-    :target: https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark
+    :target: https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark
     :alt: OCA/reporting-engine
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark
+    :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/143/15.0
+    :target: https://runbot.odoo-community.org/runbot/143/16.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -96,13 +96,18 @@ Changelog
 * [MIG] Migration to V15.
 * Define pdf watermark in company settings
 
+16.0.1.0.0 (2023-03-13)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migration to V16.
+
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -123,6 +128,7 @@ Contributors
 * Robin Goots <robin.goots@dynapps.be>
 * Foram Shah <foram.shah@initos.com>
 * Emiel van Bokhoven <emiel@360erp.nl>
+* Anjeel Haria
 
 Maintainers
 ~~~~~~~~~~~
@@ -137,6 +143,6 @@ 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.
 
-This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_pdf_watermark>`_ project on GitHub.
+This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index eabbdb4dd5..66c0d699b9 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -367,40 +367,40 @@ <h1 class="title">Pdf watermark</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id5">Installation</a></li>
-<li><a class="reference internal" href="#usage" id="id6">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id7">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="id8">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id9">12.0.1.0.0 (2019-11-18)</a></li>
-<li><a class="reference internal" href="#id2" id="id10">13.0.1.0.0 (2021-01-27)</a></li>
-<li><a class="reference internal" href="#id3" id="id11">14.0.1.0.0 (2021-01-29)</a></li>
-<li><a class="reference internal" href="#id4" id="id12">15.0.1.0.0 (2022-01-11)</a></li>
-<li><a class="reference internal" href="#id4" id="id13">16.0.1.0.0 (2023-03-13)</a></li>
+<li><a class="reference internal" href="#installation" id="id6">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id7">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id8">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id9">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id10">12.0.1.0.0 (2019-11-18)</a></li>
+<li><a class="reference internal" href="#id2" id="id11">13.0.1.0.0 (2021-01-27)</a></li>
+<li><a class="reference internal" href="#id3" id="id12">14.0.1.0.0 (2021-01-29)</a></li>
+<li><a class="reference internal" href="#id4" id="id13">15.0.1.0.0 (2022-01-11)</a></li>
+<li><a class="reference internal" href="#id5" id="id14">16.0.1.0.0 (2023-03-13)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id14">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id15">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id16">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id17">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id18">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id15">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id16">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id17">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id18">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id19">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id5">Installation</a></h1>
+<h1><a class="toc-backref" href="#id6">Installation</a></h1>
 <p>As PyPDF is not supported in python3, you need to install PyPDF2:</p>
 <pre class="literal-block">
 $ pip install pypdf2
 </pre>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id6">Usage</a></h1>
+<h1><a class="toc-backref" href="#id7">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>go to your report</li>
@@ -424,61 +424,61 @@ <h1><a class="toc-backref" href="#id6">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id7">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id8">Known issues / Roadmap</a></h1>
 <p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id8">Changelog</a></h1>
+<h1><a class="toc-backref" href="#id9">Changelog</a></h1>
 <div class="section" id="id1">
-<h2><a class="toc-backref" href="#id9">12.0.1.0.0 (2019-11-18)</a></h2>
+<h2><a class="toc-backref" href="#id10">12.0.1.0.0 (2019-11-18)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V12.</li>
 </ul>
 </div>
 <div class="section" id="id2">
-<h2><a class="toc-backref" href="#id10">13.0.1.0.0 (2021-01-27)</a></h2>
+<h2><a class="toc-backref" href="#id11">13.0.1.0.0 (2021-01-27)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V13.</li>
 </ul>
 </div>
 <div class="section" id="id3">
-<h2><a class="toc-backref" href="#id11">14.0.1.0.0 (2021-01-29)</a></h2>
+<h2><a class="toc-backref" href="#id12">14.0.1.0.0 (2021-01-29)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V14.</li>
 </ul>
 </div>
 <div class="section" id="id4">
-<h2><a class="toc-backref" href="#id12">15.0.1.0.0 (2022-01-11)</a></h2>
+<h2><a class="toc-backref" href="#id13">15.0.1.0.0 (2022-01-11)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V15.</li>
 <li>Define pdf watermark in company settings</li>
 </ul>
 </div>
-<div class="section" id="id19">
-<h2><a class="toc-backref" href="#id11">16.0.1.0.0 (2023-03-13)</a></h2>
+<div class="section" id="id5">
+<h2><a class="toc-backref" href="#id14">16.0.1.0.0 (2023-03-13)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V16.</li>
 </ul>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id13">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id15">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id14">Credits</a></h1>
+<h1><a class="toc-backref" href="#id16">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id15">Authors</a></h2>
+<h2><a class="toc-backref" href="#id17">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id16">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id18">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
@@ -490,7 +490,7 @@ <h2><a class="toc-backref" href="#id16">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id17">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id19">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>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose

From 044aa2b4cc1f86e060115779eeaf35ee1fc8bfd1 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 5 Apr 2023 08:56:17 +0000
Subject: [PATCH 37/42] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: reporting-engine-16.0/reporting-engine-16.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark/
---
 report_qweb_pdf_watermark/i18n/da.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/de.po    | 37 +++++++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/el_GR.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/es.po    | 37 +++++++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/es_CO.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/fr.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/gl.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/hr.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/hr_HR.po | 37 +++++++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/it.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/nb_NO.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/nl_NL.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/pl.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/pt.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/pt_BR.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/pt_PT.po | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/sl.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/tr.po    | 32 +++++++++++++++++++--
 report_qweb_pdf_watermark/i18n/tr_TR.po | 32 +++++++++++++++++++--
 19 files changed, 582 insertions(+), 41 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/da.po b/report_qweb_pdf_watermark/i18n/da.po
index 69defce901..7b7a3b3bb9 100644
--- a/report_qweb_pdf_watermark/i18n/da.po
+++ b/report_qweb_pdf_watermark/i18n/da.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -36,11 +36,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Rapport"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/de.po b/report_qweb_pdf_watermark/i18n/de.po
index a1331f3caf..b99cc63179 100644
--- a/report_qweb_pdf_watermark/i18n/de.po
+++ b/report_qweb_pdf_watermark/i18n/de.po
@@ -30,9 +30,9 @@ msgstr ""
 "Sie haben die Variablen 'env' und 'docs' zur Verfügung"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
-msgstr "Beispielbericht"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
@@ -40,15 +40,46 @@ msgstr "Beispielbericht"
 msgid "Report Action"
 msgstr "Bericht"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr "Wasserzeichen"
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Wasserzeichnen-Ausdruck"
 
+#~ msgid "Demo report"
+#~ msgstr "Beispielbericht"
+
 #~ msgid "ir.actions.report"
 #~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/el_GR.po b/report_qweb_pdf_watermark/i18n/el_GR.po
index 60901f2d2a..dca96ae3a2 100644
--- a/report_qweb_pdf_watermark/i18n/el_GR.po
+++ b/report_qweb_pdf_watermark/i18n/el_GR.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Αναφορά"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index 05fcad4091..2673ff51d3 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -30,9 +30,9 @@ msgstr ""
 "Tiene acceso a las variables `env` y `docs`."
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
-msgstr "Informe demo"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
@@ -40,15 +40,46 @@ msgstr "Informe demo"
 msgid "Report Action"
 msgstr "Informe"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr "Marca de agua"
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Expresión para la marca de agua"
 
+#~ msgid "Demo report"
+#~ msgstr "Informe demo"
+
 #~ msgid "ir.actions.report"
 #~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/es_CO.po b/report_qweb_pdf_watermark/i18n/es_CO.po
index 9d30c3b425..47d77030fa 100644
--- a/report_qweb_pdf_watermark/i18n/es_CO.po
+++ b/report_qweb_pdf_watermark/i18n/es_CO.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Iforme"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/fr.po b/report_qweb_pdf_watermark/i18n/fr.po
index 4eb7a6926d..1f8b8f520b 100644
--- a/report_qweb_pdf_watermark/i18n/fr.po
+++ b/report_qweb_pdf_watermark/i18n/fr.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Rapport"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/gl.po b/report_qweb_pdf_watermark/i18n/gl.po
index 7f1d878a5e..2373ba42a5 100644
--- a/report_qweb_pdf_watermark/i18n/gl.po
+++ b/report_qweb_pdf_watermark/i18n/gl.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -36,11 +36,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Informe"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/hr.po b/report_qweb_pdf_watermark/i18n/hr.po
index 744b0fa2f4..bb8a1cc164 100644
--- a/report_qweb_pdf_watermark/i18n/hr.po
+++ b/report_qweb_pdf_watermark/i18n/hr.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -36,11 +36,39 @@ msgstr ""
 msgid "Report Action"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/hr_HR.po b/report_qweb_pdf_watermark/i18n/hr_HR.po
index d319405a84..24024e2e9e 100644
--- a/report_qweb_pdf_watermark/i18n/hr_HR.po
+++ b/report_qweb_pdf_watermark/i18n/hr_HR.po
@@ -30,9 +30,9 @@ msgstr ""
 "Imate pristup varijablama 'env' i 'docs'"
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
-msgstr "Demo izvještaj"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
+msgstr ""
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
@@ -40,15 +40,46 @@ msgstr "Demo izvještaj"
 msgid "Report Action"
 msgstr "Izvještaj"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr "Vodeni žig"
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
 msgstr "Izraz vodenog žiga"
 
+#~ msgid "Demo report"
+#~ msgstr "Demo izvještaj"
+
 #~ msgid "ir.actions.report"
 #~ msgstr "ir.actions.report"
diff --git a/report_qweb_pdf_watermark/i18n/it.po b/report_qweb_pdf_watermark/i18n/it.po
index 8629a0da80..cff42693aa 100644
--- a/report_qweb_pdf_watermark/i18n/it.po
+++ b/report_qweb_pdf_watermark/i18n/it.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Report"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/nb_NO.po b/report_qweb_pdf_watermark/i18n/nb_NO.po
index 3b927c9d06..56408c1cd4 100644
--- a/report_qweb_pdf_watermark/i18n/nb_NO.po
+++ b/report_qweb_pdf_watermark/i18n/nb_NO.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Rapport"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/nl_NL.po b/report_qweb_pdf_watermark/i18n/nl_NL.po
index 9afc19d560..9efefc5d9e 100644
--- a/report_qweb_pdf_watermark/i18n/nl_NL.po
+++ b/report_qweb_pdf_watermark/i18n/nl_NL.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Rapport"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/pl.po b/report_qweb_pdf_watermark/i18n/pl.po
index 5a57261e11..9b8fa07b75 100644
--- a/report_qweb_pdf_watermark/i18n/pl.po
+++ b/report_qweb_pdf_watermark/i18n/pl.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Raport"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/pt.po b/report_qweb_pdf_watermark/i18n/pt.po
index f2fe2def10..6b76e599a4 100644
--- a/report_qweb_pdf_watermark/i18n/pt.po
+++ b/report_qweb_pdf_watermark/i18n/pt.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -36,11 +36,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Relatório"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/pt_BR.po b/report_qweb_pdf_watermark/i18n/pt_BR.po
index 5af580d038..4d87d8bf16 100644
--- a/report_qweb_pdf_watermark/i18n/pt_BR.po
+++ b/report_qweb_pdf_watermark/i18n/pt_BR.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Relatório"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/pt_PT.po b/report_qweb_pdf_watermark/i18n/pt_PT.po
index fcc8831f70..c96f0aea60 100644
--- a/report_qweb_pdf_watermark/i18n/pt_PT.po
+++ b/report_qweb_pdf_watermark/i18n/pt_PT.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -38,11 +38,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Relatório"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/sl.po b/report_qweb_pdf_watermark/i18n/sl.po
index 8da19a87c4..149c2034d0 100644
--- a/report_qweb_pdf_watermark/i18n/sl.po
+++ b/report_qweb_pdf_watermark/i18n/sl.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Poročilo"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/tr.po b/report_qweb_pdf_watermark/i18n/tr.po
index 65ce41c6ba..099d2fd63f 100644
--- a/report_qweb_pdf_watermark/i18n/tr.po
+++ b/report_qweb_pdf_watermark/i18n/tr.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -35,11 +35,39 @@ msgstr ""
 msgid "Report Action"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"
diff --git a/report_qweb_pdf_watermark/i18n/tr_TR.po b/report_qweb_pdf_watermark/i18n/tr_TR.po
index f831139291..94bee3134b 100644
--- a/report_qweb_pdf_watermark/i18n/tr_TR.po
+++ b/report_qweb_pdf_watermark/i18n/tr_TR.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
-#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
-msgid "Demo report"
+#: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: report_qweb_pdf_watermark
@@ -37,11 +37,39 @@ msgstr ""
 msgid "Report Action"
 msgstr "Rapor"
 
+#. module: report_qweb_pdf_watermark
+#: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
+msgid ""
+"Upload an pdf file to use as an Company watermark. You need to activate the "
+"setting 'use company watermark' on the reports where you want to use it."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+msgid "Upload an pdf file to use as an watermark on this report."
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use Company Watermark"
+msgstr ""
+
+#. module: report_qweb_pdf_watermark
+#: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
+msgid "Use the pdf watermark defined globally in the company settings."
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
+#: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_res_company__pdf_watermark
 msgid "Watermark"
 msgstr ""
 
+#. module: report_qweb_pdf_watermark
+#: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
+msgid "Watermark Demo report"
+msgstr ""
+
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
 msgid "Watermark expression"

From 4b819332383e88446ee54e4412952dd8348b5b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mart=C3=ADn?= <raul.martin@braintec.com>
Date: Fri, 25 Aug 2023 17:23:08 +0200
Subject: [PATCH 38/42] [IMP] Avoiding ERROR in log with tests of
 report_qweb_pdf_watermark

---
 .../tests/test_report_qweb_pdf_watermark.py                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 4eb66cd96a..a4af8be91d 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
@@ -51,7 +51,10 @@ def test_pdf_has_usable_pages(self):
         # test 0
         numpages = 0
         # pdf_has_usable_pages(self, pdf_watermark)
-        self.assertFalse(self.env["ir.actions.report"].pdf_has_usable_pages(numpages))
+        with self.assertLogs(level="ERROR"):
+            self.assertFalse(
+                self.env["ir.actions.report"].pdf_has_usable_pages(numpages)
+            )
         # test 1
         numpages = 1
         self.assertTrue(self.env["ir.actions.report"].pdf_has_usable_pages(numpages))

From 3fa18d5d55ecc89cbefd8cdfad88b2212aa16c00 Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 23 Aug 2023 13:31:23 +0000
Subject: [PATCH 39/42] Translated using Weblate (Spanish)

Currently translated at 100.0% (10 of 10 strings)

Translation: reporting-engine-16.0/reporting-engine-16.0-report_qweb_pdf_watermark
Translate-URL: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark/es/
---
 report_qweb_pdf_watermark/i18n/es.po | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/report_qweb_pdf_watermark/i18n/es.po b/report_qweb_pdf_watermark/i18n/es.po
index 2673ff51d3..ba9dd8abdf 100644
--- a/report_qweb_pdf_watermark/i18n/es.po
+++ b/report_qweb_pdf_watermark/i18n/es.po
@@ -10,14 +10,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-10 03:40+0000\n"
-"PO-Revision-Date: 2017-01-10 03:40+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"PO-Revision-Date: 2023-09-02 20:42+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression
@@ -27,18 +28,17 @@ msgid ""
 msgstr ""
 "Una expresión que obtenga los datos codificados en base64 a ser usada como "
 "marca de agua.\n"
-"Tiene acceso a las variables `env` y `docs`."
+"Tiene acceso a las variables `env` y `docs`"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model,name:report_qweb_pdf_watermark.model_ir_actions_report
-#, fuzzy
 msgid "Report Action"
-msgstr "Informe"
+msgstr "Informar Acción"
 
 #. module: report_qweb_pdf_watermark
 #: model_terms:ir.ui.view,arch_db:report_qweb_pdf_watermark.view_company_form
@@ -46,21 +46,27 @@ msgid ""
 "Upload an pdf file to use as an Company watermark. You need to activate the "
 "setting 'use company watermark' on the reports where you want to use it."
 msgstr ""
+"Cargue un archivo pdf para utilizarlo como marca de agua de la compañía. "
+"Debe activar la opción \"utilizar marca de agua de la compañía\" en los "
+"informes en los que desee utilizarla."
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
 msgid "Upload an pdf file to use as an watermark on this report."
 msgstr ""
+"Cargue un archivo pdf para utilizarlo como marca de agua en este informe."
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
 msgid "Use Company Watermark"
-msgstr ""
+msgstr "Utilizar la marca de agua de la compañía"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,help:report_qweb_pdf_watermark.field_ir_actions_report__use_company_watermark
 msgid "Use the pdf watermark defined globally in the company settings."
 msgstr ""
+"Utilice la marca de agua pdf definida globalmente en la configuración de la "
+"compañía."
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark
@@ -71,7 +77,7 @@ msgstr "Marca de agua"
 #. module: report_qweb_pdf_watermark
 #: model:ir.actions.report,name:report_qweb_pdf_watermark.demo_report
 msgid "Watermark Demo report"
-msgstr ""
+msgstr "Informe de demostración de marca de agua"
 
 #. module: report_qweb_pdf_watermark
 #: model:ir.model.fields,field_description:report_qweb_pdf_watermark.field_ir_actions_report__pdf_watermark_expression

From 8ab367ada92eefb2da754ab0c3c8e6b97fbffe34 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 3 Sep 2023 16:00:44 +0000
Subject: [PATCH 40/42] [UPD] README.rst

---
 report_qweb_pdf_watermark/README.rst          | 15 ++--
 .../static/description/index.html             | 80 ++++++++++---------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index fdb2f47cef..d2afa15346 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -2,10 +2,13 @@
 Pdf watermark
 =============
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:2940fdc81ee124d4fef7eef00d6394463dddb5177a4996e6c5ffcb6a19b5734e
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Pdf watermark
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/143/16.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
 
@@ -106,7 +109,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index 66c0d699b9..97a381e8be 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Pdf watermark</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,41 +366,43 @@ <h1 class="title">Pdf watermark</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:2940fdc81ee124d4fef7eef00d6394463dddb5177a4996e6c5ffcb6a19b5734e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id6">Installation</a></li>
-<li><a class="reference internal" href="#usage" id="id7">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id8">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="id9">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id10">12.0.1.0.0 (2019-11-18)</a></li>
-<li><a class="reference internal" href="#id2" id="id11">13.0.1.0.0 (2021-01-27)</a></li>
-<li><a class="reference internal" href="#id3" id="id12">14.0.1.0.0 (2021-01-29)</a></li>
-<li><a class="reference internal" href="#id4" id="id13">15.0.1.0.0 (2022-01-11)</a></li>
-<li><a class="reference internal" href="#id5" id="id14">16.0.1.0.0 (2023-03-13)</a></li>
+<li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-4">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-5">12.0.1.0.0 (2019-11-18)</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-6">13.0.1.0.0 (2021-01-27)</a></li>
+<li><a class="reference internal" href="#section-3" id="toc-entry-7">14.0.1.0.0 (2021-01-29)</a></li>
+<li><a class="reference internal" href="#section-4" id="toc-entry-8">15.0.1.0.0 (2022-01-11)</a></li>
+<li><a class="reference internal" href="#section-5" id="toc-entry-9">16.0.1.0.0 (2023-03-13)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id15">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id16">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id17">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id18">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id19">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-10">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-11">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-12">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-13">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-14">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id6">Installation</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>As PyPDF is not supported in python3, you need to install PyPDF2:</p>
 <pre class="literal-block">
 $ pip install pypdf2
 </pre>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id7">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>go to your report</li>
@@ -424,61 +426,61 @@ <h1><a class="toc-backref" href="#id7">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id8">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
 <p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id9">Changelog</a></h1>
-<div class="section" id="id1">
-<h2><a class="toc-backref" href="#id10">12.0.1.0.0 (2019-11-18)</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-5">12.0.1.0.0 (2019-11-18)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V12.</li>
 </ul>
 </div>
-<div class="section" id="id2">
-<h2><a class="toc-backref" href="#id11">13.0.1.0.0 (2021-01-27)</a></h2>
+<div class="section" id="section-2">
+<h2><a class="toc-backref" href="#toc-entry-6">13.0.1.0.0 (2021-01-27)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V13.</li>
 </ul>
 </div>
-<div class="section" id="id3">
-<h2><a class="toc-backref" href="#id12">14.0.1.0.0 (2021-01-29)</a></h2>
+<div class="section" id="section-3">
+<h2><a class="toc-backref" href="#toc-entry-7">14.0.1.0.0 (2021-01-29)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V14.</li>
 </ul>
 </div>
-<div class="section" id="id4">
-<h2><a class="toc-backref" href="#id13">15.0.1.0.0 (2022-01-11)</a></h2>
+<div class="section" id="section-4">
+<h2><a class="toc-backref" href="#toc-entry-8">15.0.1.0.0 (2022-01-11)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V15.</li>
 <li>Define pdf watermark in company settings</li>
 </ul>
 </div>
-<div class="section" id="id5">
-<h2><a class="toc-backref" href="#id14">16.0.1.0.0 (2023-03-13)</a></h2>
+<div class="section" id="section-5">
+<h2><a class="toc-backref" href="#toc-entry-9">16.0.1.0.0 (2023-03-13)</a></h2>
 <ul class="simple">
 <li>[MIG] Migration to V16.</li>
 </ul>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id15">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-10">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id16">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-11">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id17">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-12">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id18">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-13">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
@@ -490,7 +492,7 @@ <h2><a class="toc-backref" href="#id18">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id19">Maintainers</a></h2>
+<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>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose

From 18eb03d9a2518a97a57db6b1f5814c3703535a42 Mon Sep 17 00:00:00 2001
From: Sander Lienaerts <sander.lienaerts@codeforward.nl>
Date: Fri, 12 Jan 2024 15:15:01 +0100
Subject: [PATCH 41/42] [IMP] report_qweb_pdf_watermark: black, isort, prettier

---
 report_qweb_pdf_watermark/README.rst          | 99 ++++++++++---------
 report_qweb_pdf_watermark/pyproject.toml      |  3 +
 .../readme/CONTRIBUTORS.md                    |  7 ++
 .../readme/CONTRIBUTORS.rst                   |  7 --
 .../readme/DESCRIPTION.md                     |  5 +
 .../readme/DESCRIPTION.rst                    |  1 -
 report_qweb_pdf_watermark/readme/HISTORY.md   | 20 ++++
 report_qweb_pdf_watermark/readme/HISTORY.rst  | 28 ------
 .../readme/{INSTALL.rst => INSTALL.md}        |  5 +-
 report_qweb_pdf_watermark/readme/ROADMAP.md   |  3 +
 report_qweb_pdf_watermark/readme/ROADMAP.rst  |  1 -
 report_qweb_pdf_watermark/readme/USAGE.md     | 23 +++++
 report_qweb_pdf_watermark/readme/USAGE.rst    | 20 ----
 .../static/description/index.html             | 29 ++++--
 14 files changed, 135 insertions(+), 116 deletions(-)
 create mode 100644 report_qweb_pdf_watermark/pyproject.toml
 create mode 100644 report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
 delete mode 100644 report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
 create mode 100644 report_qweb_pdf_watermark/readme/DESCRIPTION.md
 delete mode 100644 report_qweb_pdf_watermark/readme/DESCRIPTION.rst
 create mode 100644 report_qweb_pdf_watermark/readme/HISTORY.md
 delete mode 100644 report_qweb_pdf_watermark/readme/HISTORY.rst
 rename report_qweb_pdf_watermark/readme/{INSTALL.rst => INSTALL.md} (70%)
 create mode 100644 report_qweb_pdf_watermark/readme/ROADMAP.md
 delete mode 100644 report_qweb_pdf_watermark/readme/ROADMAP.rst
 create mode 100644 report_qweb_pdf_watermark/readme/USAGE.md
 delete mode 100644 report_qweb_pdf_watermark/readme/USAGE.rst

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index d2afa15346..f2a13ac7f2 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -17,18 +17,22 @@ Pdf watermark
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github
-    :target: https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark
+    :target: https://github.com/OCA/reporting-engine/tree/17.0/report_qweb_pdf_watermark
     :alt: OCA/reporting-engine
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark
+    :target: https://translation.odoo-community.org/projects/reporting-engine-17-0/reporting-engine-17-0-report_qweb_pdf_watermark
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
+This module was written to add watermarks (backgrounds) to PDF reports.
+Because of the way wkhtmltopdf handles headers and footers in the
+current versions, it is quite impossible to have a background for the
+complete page using HTML and CSS. That is why this module inserts the
+image at the PDF level.
 
 **Table of contents**
 
@@ -38,71 +42,74 @@ This module was written to add watermarks (backgrounds) to PDF reports. Because
 Installation
 ============
 
+As PyPDF is not supported in python3, you need to install PyPDF2:
 
-As PyPDF is not supported in python3, you need to install PyPDF2::
+::
 
-$ pip install pypdf2
+   $ pip install pypdf2
 
 Usage
 =====
 
 To use this module, you need to:
 
-#. go to your report
-#. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
-#. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
+1. go to your report
+2. select a PDF or image to use as watermark. Note that resolutions and
+   size must match, otherwise you'll have funny results
+3. You can also fill in an expression that returns the data (base64
+   encoded) to be used as watermark
 
 To use the Company watermark, you need to:
 
-#. go to settings --> company --> update info
-#. upload an pdf watermark
-#. go to settings --> technical --> reporting --> reports
-#. Select the report where you want to use it.
-#. On the 'Advanced Properties' tab of the notebook check 'use company watermark'
+1. go to settings --> company --> update info
+2. upload an pdf watermark
+3. go to settings --> technical --> reporting --> reports
+4. Select the report where you want to use it.
+5. On the 'Advanced Properties' tab of the notebook check 'use company
+   watermark'
 
-### Demo
-And demo report is available (if you have demo data installed) on the users form view.
+### Demo And demo report is available (if you have demo data installed)
+on the users form view.
 
-#. go to Configuration --> users
-#. Select an users
-#. Click the print button --> Watermark Demo report.
+1. go to Configuration --> users
+2. Select an users
+3. Click the print button --> Watermark Demo report.
 
 Known issues / Roadmap
 ======================
 
-This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.
+This module depends on support for transparent backgrounds in
+Wkhtmltopdf, which has been flaky in the past. This module has been
+reported to work with Wkhtmltopdf 0.12.4.
 
 Changelog
 =========
 
 12.0.1.0.0 (2019-11-18)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [MIG] Migration to V12.
+-----------------------
 
+-  [MIG] Migration to V12.
 
 13.0.1.0.0 (2021-01-27)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [MIG] Migration to V13.
+-----------------------
 
+-  [MIG] Migration to V13.
 
 14.0.1.0.0 (2021-01-29)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [MIG] Migration to V14.
+-----------------------
 
+-  [MIG] Migration to V14.
 
 15.0.1.0.0 (2022-01-11)
-~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------
 
-* [MIG] Migration to V15.
-* Define pdf watermark in company settings
+-  [MIG] Migration to V15.
+-  Define pdf watermark in company settings
 
 16.0.1.0.0 (2023-03-13)
-~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------
 
-* [MIG] Migration to V16.
+-  [MIG] Migration to V16.
 
 Bug Tracker
 ===========
@@ -110,7 +117,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -118,23 +125,23 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Therp BV
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* Holger Brunn <hbrunn@therp.nl>
-* Stefan Rijnhart <stefan@opener.am>
-* Rod Schouteden <rod.schouteden@dynapps.be>
-* Robin Goots <robin.goots@dynapps.be>
-* Foram Shah <foram.shah@initos.com>
-* Emiel van Bokhoven <emiel@360erp.nl>
-* Anjeel Haria
+-  Holger Brunn <hbrunn@therp.nl>
+-  Stefan Rijnhart <stefan@opener.am>
+-  Rod Schouteden <rod.schouteden@dynapps.be>
+-  Robin Goots <robin.goots@dynapps.be>
+-  Foram Shah <foram.shah@initos.com>
+-  Emiel van Bokhoven <emiel@360erp.nl>
+-  Anjeel Haria
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -146,6 +153,6 @@ 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.
 
-This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark>`_ project on GitHub.
+This module is part of the `OCA/reporting-engine <https://github.com/OCA/reporting-engine/tree/17.0/report_qweb_pdf_watermark>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/report_qweb_pdf_watermark/pyproject.toml b/report_qweb_pdf_watermark/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/report_qweb_pdf_watermark/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..ad0c79fb37
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
@@ -0,0 +1,7 @@
+- Holger Brunn \<<hbrunn@therp.nl>\>
+- Stefan Rijnhart \<<stefan@opener.am>\>
+- Rod Schouteden \<<rod.schouteden@dynapps.be>\>
+- Robin Goots \<<robin.goots@dynapps.be>\>
+- Foram Shah \<<foram.shah@initos.com>\>
+- Emiel van Bokhoven \<<emiel@360erp.nl>\>
+- Anjeel Haria
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
deleted file mode 100644
index cd5afe984e..0000000000
--- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-* Holger Brunn <hbrunn@therp.nl>
-* Stefan Rijnhart <stefan@opener.am>
-* Rod Schouteden <rod.schouteden@dynapps.be>
-* Robin Goots <robin.goots@dynapps.be>
-* Foram Shah <foram.shah@initos.com>
-* Emiel van Bokhoven <emiel@360erp.nl>
-* Anjeel Haria
diff --git a/report_qweb_pdf_watermark/readme/DESCRIPTION.md b/report_qweb_pdf_watermark/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..5579135f4f
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/DESCRIPTION.md
@@ -0,0 +1,5 @@
+This module was written to add watermarks (backgrounds) to PDF reports.
+Because of the way wkhtmltopdf handles headers and footers in the
+current versions, it is quite impossible to have a background for the
+complete page using HTML and CSS. That is why this module inserts the
+image at the PDF level.
diff --git a/report_qweb_pdf_watermark/readme/DESCRIPTION.rst b/report_qweb_pdf_watermark/readme/DESCRIPTION.rst
deleted file mode 100644
index 31f5962e12..0000000000
--- a/report_qweb_pdf_watermark/readme/DESCRIPTION.rst
+++ /dev/null
@@ -1 +0,0 @@
-This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.md b/report_qweb_pdf_watermark/readme/HISTORY.md
new file mode 100644
index 0000000000..7134b9d026
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/HISTORY.md
@@ -0,0 +1,20 @@
+## 12.0.1.0.0 (2019-11-18)
+
+- \[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.
+
+## 15.0.1.0.0 (2022-01-11)
+
+- \[MIG\] Migration to V15.
+- Define pdf watermark in company settings
+
+## 16.0.1.0.0 (2023-03-13)
+
+- \[MIG\] Migration to V16.
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.rst b/report_qweb_pdf_watermark/readme/HISTORY.rst
deleted file mode 100644
index caf0c913c8..0000000000
--- a/report_qweb_pdf_watermark/readme/HISTORY.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-12.0.1.0.0 (2019-11-18)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [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.
-
-
-15.0.1.0.0 (2022-01-11)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [MIG] Migration to V15.
-* Define pdf watermark in company settings
-
-16.0.1.0.0 (2023-03-13)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* [MIG] Migration to V16.
diff --git a/report_qweb_pdf_watermark/readme/INSTALL.rst b/report_qweb_pdf_watermark/readme/INSTALL.md
similarity index 70%
rename from report_qweb_pdf_watermark/readme/INSTALL.rst
rename to report_qweb_pdf_watermark/readme/INSTALL.md
index dc11dadce7..9c0fa342f6 100644
--- a/report_qweb_pdf_watermark/readme/INSTALL.rst
+++ b/report_qweb_pdf_watermark/readme/INSTALL.md
@@ -1,4 +1,3 @@
+As PyPDF is not supported in python3, you need to install PyPDF2:
 
-As PyPDF is not supported in python3, you need to install PyPDF2::
-
-$ pip install pypdf2
+    $ pip install pypdf2
diff --git a/report_qweb_pdf_watermark/readme/ROADMAP.md b/report_qweb_pdf_watermark/readme/ROADMAP.md
new file mode 100644
index 0000000000..e848ba42f2
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/ROADMAP.md
@@ -0,0 +1,3 @@
+This module depends on support for transparent backgrounds in
+Wkhtmltopdf, which has been flaky in the past. This module has been
+reported to work with Wkhtmltopdf 0.12.4.
diff --git a/report_qweb_pdf_watermark/readme/ROADMAP.rst b/report_qweb_pdf_watermark/readme/ROADMAP.rst
deleted file mode 100644
index 22c286a808..0000000000
--- a/report_qweb_pdf_watermark/readme/ROADMAP.rst
+++ /dev/null
@@ -1 +0,0 @@
-This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.
diff --git a/report_qweb_pdf_watermark/readme/USAGE.md b/report_qweb_pdf_watermark/readme/USAGE.md
new file mode 100644
index 0000000000..3e6c269a76
--- /dev/null
+++ b/report_qweb_pdf_watermark/readme/USAGE.md
@@ -0,0 +1,23 @@
+To use this module, you need to:
+
+1.  go to your report
+2.  select a PDF or image to use as watermark. Note that resolutions and
+    size must match, otherwise you'll have funny results
+3.  You can also fill in an expression that returns the data (base64
+    encoded) to be used as watermark
+
+To use the Company watermark, you need to:
+
+1.  go to settings --\> company --\> update info
+2.  upload an pdf watermark
+3.  go to settings --\> technical --\> reporting --\> reports
+4.  Select the report where you want to use it.
+5.  On the 'Advanced Properties' tab of the notebook check 'use company
+    watermark'
+
+\### Demo And demo report is available (if you have demo data installed)
+on the users form view.
+
+1.  go to Configuration --\> users
+2.  Select an users
+3.  Click the print button --\> Watermark Demo report.
diff --git a/report_qweb_pdf_watermark/readme/USAGE.rst b/report_qweb_pdf_watermark/readme/USAGE.rst
deleted file mode 100644
index a725032f19..0000000000
--- a/report_qweb_pdf_watermark/readme/USAGE.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-To use this module, you need to:
-
-#. go to your report
-#. select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you'll have funny results
-#. You can also fill in an expression that returns the data (base64 encoded) to be used as watermark
-
-To use the Company watermark, you need to:
-
-#. go to settings --> company --> update info
-#. upload an pdf watermark
-#. go to settings --> technical --> reporting --> reports
-#. Select the report where you want to use it.
-#. On the 'Advanced Properties' tab of the notebook check 'use company watermark'
-
-### Demo
-And demo report is available (if you have demo data installed) on the users form view.
-
-#. go to Configuration --> users
-#. Select an users
-#. Click the print button --> Watermark Demo report.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index 97a381e8be..bd1652870a 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -369,8 +369,12 @@ <h1 class="title">Pdf watermark</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:2940fdc81ee124d4fef7eef00d6394463dddb5177a4996e6c5ffcb6a19b5734e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module was written to add watermarks (backgrounds) to PDF reports. Because of the way wkhtmltopdf handles headers and footers in the current versions, it is quite impossible to have a background for the complete page using HTML and CSS. That is why this module inserts the image at the PDF level.</p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/reporting-engine/tree/17.0/report_qweb_pdf_watermark"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/reporting-engine-17-0/reporting-engine-17-0-report_qweb_pdf_watermark"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module was written to add watermarks (backgrounds) to PDF reports.
+Because of the way wkhtmltopdf handles headers and footers in the
+current versions, it is quite impossible to have a background for the
+complete page using HTML and CSS. That is why this module inserts the
+image at the PDF level.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -406,8 +410,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>go to your report</li>
-<li>select a PDF or image to use as watermark. Note that resolutions and size must match, otherwise you’ll have funny results</li>
-<li>You can also fill in an expression that returns the data (base64 encoded) to be used as watermark</li>
+<li>select a PDF or image to use as watermark. Note that resolutions and
+size must match, otherwise you’ll have funny results</li>
+<li>You can also fill in an expression that returns the data (base64
+encoded) to be used as watermark</li>
 </ol>
 <p>To use the Company watermark, you need to:</p>
 <ol class="arabic simple">
@@ -415,10 +421,11 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <li>upload an pdf watermark</li>
 <li>go to settings –&gt; technical –&gt; reporting –&gt; reports</li>
 <li>Select the report where you want to use it.</li>
-<li>On the ‘Advanced Properties’ tab of the notebook check ‘use company watermark’</li>
+<li>On the ‘Advanced Properties’ tab of the notebook check ‘use company
+watermark’</li>
 </ol>
-<p>### Demo
-And demo report is available (if you have demo data installed) on the users form view.</p>
+<p>### Demo And demo report is available (if you have demo data installed)
+on the users form view.</p>
 <ol class="arabic simple">
 <li>go to Configuration –&gt; users</li>
 <li>Select an users</li>
@@ -427,7 +434,9 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
-<p>This module depends on support for transparent backgrounds in Wkhtmltopdf, which has been flaky in the past. This module has been reported to work with Wkhtmltopdf 0.12.4.</p>
+<p>This module depends on support for transparent backgrounds in
+Wkhtmltopdf, which has been flaky in the past. This module has been
+reported to work with Wkhtmltopdf 0.12.4.</p>
 </div>
 <div class="section" id="changelog">
 <h1><a class="toc-backref" href="#toc-entry-4">Changelog</a></h1>
@@ -468,7 +477,7 @@ <h1><a class="toc-backref" href="#toc-entry-10">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/reporting-engine/issues/new?body=module:%20report_qweb_pdf_watermark%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -498,7 +507,7 @@ <h2><a class="toc-backref" href="#toc-entry-14">Maintainers</a></h2>
 <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>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/reporting-engine/tree/17.0/report_qweb_pdf_watermark">OCA/reporting-engine</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 5c8321a031d772a8e6209238e2d3bdf9612b04eb Mon Sep 17 00:00:00 2001
From: Sander Lienaerts <sander.lienaerts@codeforward.nl>
Date: Fri, 12 Jan 2024 15:37:55 +0100
Subject: [PATCH 42/42] [MIG] report_qweb_pdf_watermark: Migration to 17.0

---
 report_qweb_pdf_watermark/README.rst          |  6 ++++
 report_qweb_pdf_watermark/__manifest__.py     |  3 +-
 report_qweb_pdf_watermark/models/report.py    | 15 +++++-----
 .../readme/CONTRIBUTORS.md                    |  1 +
 report_qweb_pdf_watermark/readme/HISTORY.md   |  4 +++
 .../static/description/index.html             | 28 ++++++++++++-------
 .../views/ir_actions_report_xml.xml           |  6 ++--
 7 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/report_qweb_pdf_watermark/README.rst b/report_qweb_pdf_watermark/README.rst
index f2a13ac7f2..a44a4786aa 100644
--- a/report_qweb_pdf_watermark/README.rst
+++ b/report_qweb_pdf_watermark/README.rst
@@ -111,6 +111,11 @@ Changelog
 
 -  [MIG] Migration to V16.
 
+17.0.1.0.0 (2024-01-12)
+-----------------------
+
+-  [MIG] Migration to V17.
+
 Bug Tracker
 ===========
 
@@ -138,6 +143,7 @@ Contributors
 -  Robin Goots <robin.goots@dynapps.be>
 -  Foram Shah <foram.shah@initos.com>
 -  Emiel van Bokhoven <emiel@360erp.nl>
+-  Sander Lienaerts <sander.lienaerts@codeforward.nl>
 -  Anjeel Haria
 
 Maintainers
diff --git a/report_qweb_pdf_watermark/__manifest__.py b/report_qweb_pdf_watermark/__manifest__.py
index 26b350f8db..4c40df09d3 100644
--- a/report_qweb_pdf_watermark/__manifest__.py
+++ b/report_qweb_pdf_watermark/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Pdf watermark",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Therp BV, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Technical Settings",
@@ -11,7 +11,6 @@
     "website": "https://github.com/OCA/reporting-engine",
     "depends": ["web"],
     "data": [
-        "demo/report.xml",
         "views/ir_actions_report_xml.xml",
         "views/res_company.xml",
     ],
diff --git a/report_qweb_pdf_watermark/models/report.py b/report_qweb_pdf_watermark/models/report.py
index b48516933d..40ecd027cc 100644
--- a/report_qweb_pdf_watermark/models/report.py
+++ b/report_qweb_pdf_watermark/models/report.py
@@ -44,14 +44,15 @@ class Report(models.Model):
 
     def _render_qweb_pdf(self, report_ref, 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(
-                report_ref, res_ids=res_ids, data=data
+            return (
+                super()
+                .with_context(res_ids=res_ids)
+                ._render_qweb_pdf(report_ref, res_ids=res_ids, data=data)
             )
-        return super(Report, self)._render_qweb_pdf(
-            report_ref, res_ids=res_ids, data=data
-        )
+        return super()._render_qweb_pdf(report_ref, res_ids=res_ids, data=data)
 
-    def pdf_has_usable_pages(self, numpages):
+    @staticmethod
+    def pdf_has_usable_pages(numpages):
         if numpages < 1:
             logger.error("Your watermark pdf does not contain any pages")
             return False
@@ -73,7 +74,7 @@ def _run_wkhtmltopdf(
         specific_paperformat_args=None,
         set_viewport_size=False,
     ):
-        result = super(Report, self)._run_wkhtmltopdf(
+        result = super()._run_wkhtmltopdf(
             bodies,
             report_ref=report_ref,
             header=header,
diff --git a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
index ad0c79fb37..86a50f5c5a 100644
--- a/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
+++ b/report_qweb_pdf_watermark/readme/CONTRIBUTORS.md
@@ -4,4 +4,5 @@
 - Robin Goots \<<robin.goots@dynapps.be>\>
 - Foram Shah \<<foram.shah@initos.com>\>
 - Emiel van Bokhoven \<<emiel@360erp.nl>\>
+- Sander Lienaerts \<<sander.lienaerts@codeforward.nl>\>
 - Anjeel Haria
diff --git a/report_qweb_pdf_watermark/readme/HISTORY.md b/report_qweb_pdf_watermark/readme/HISTORY.md
index 7134b9d026..cd00602e50 100644
--- a/report_qweb_pdf_watermark/readme/HISTORY.md
+++ b/report_qweb_pdf_watermark/readme/HISTORY.md
@@ -18,3 +18,7 @@
 ## 16.0.1.0.0 (2023-03-13)
 
 - \[MIG\] Migration to V16.
+
+## 17.0.1.0.0 (2024-01-12)
+
+- \[MIG\] Migration to V17.
diff --git a/report_qweb_pdf_watermark/static/description/index.html b/report_qweb_pdf_watermark/static/description/index.html
index bd1652870a..344f88d24f 100644
--- a/report_qweb_pdf_watermark/static/description/index.html
+++ b/report_qweb_pdf_watermark/static/description/index.html
@@ -387,13 +387,14 @@ <h1 class="title">Pdf watermark</h1>
 <li><a class="reference internal" href="#section-3" id="toc-entry-7">14.0.1.0.0 (2021-01-29)</a></li>
 <li><a class="reference internal" href="#section-4" id="toc-entry-8">15.0.1.0.0 (2022-01-11)</a></li>
 <li><a class="reference internal" href="#section-5" id="toc-entry-9">16.0.1.0.0 (2023-03-13)</a></li>
+<li><a class="reference internal" href="#section-6" id="toc-entry-10">17.0.1.0.0 (2024-01-12)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-10">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-11">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-12">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-13">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-14">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-11">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-12">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-13">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-14">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-15">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -471,9 +472,15 @@ <h2><a class="toc-backref" href="#toc-entry-9">16.0.1.0.0 (2023-03-13)</a></h2>
 <li>[MIG] Migration to V16.</li>
 </ul>
 </div>
+<div class="section" id="section-6">
+<h2><a class="toc-backref" href="#toc-entry-10">17.0.1.0.0 (2024-01-12)</a></h2>
+<ul class="simple">
+<li>[MIG] Migration to V17.</li>
+</ul>
+</div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-10">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-11">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -481,15 +488,15 @@ <h1><a class="toc-backref" href="#toc-entry-10">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-11">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-12">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-12">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-13">Authors</a></h2>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-13">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-14">Contributors</a></h2>
 <ul class="simple">
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.am">stefan&#64;opener.am</a>&gt;</li>
@@ -497,11 +504,12 @@ <h2><a class="toc-backref" href="#toc-entry-13">Contributors</a></h2>
 <li>Robin Goots &lt;<a class="reference external" href="mailto:robin.goots&#64;dynapps.be">robin.goots&#64;dynapps.be</a>&gt;</li>
 <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>Sander Lienaerts &lt;<a class="reference external" href="mailto:sander.lienaerts&#64;codeforward.nl">sander.lienaerts&#64;codeforward.nl</a>&gt;</li>
 <li>Anjeel Haria</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-14">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-15">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>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
index 98b493f2b8..5b9cdd3c39 100644
--- a/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
+++ b/report_qweb_pdf_watermark/views/ir_actions_report_xml.xml
@@ -7,16 +7,16 @@
             <field name="attachment" position="after">
                 <field
                     name="use_company_watermark"
-                    attrs="{'invisible': [('report_type', '!=', 'qweb-pdf')]}"
+                    invisible="report_type != 'qweb-pdf'"
                 />
                 <field
                     name="pdf_watermark_expression"
-                    attrs="{'invisible': ['|',('report_type', '!=', 'qweb-pdf'),('use_company_watermark', '=', True)]}"
+                    invisible="report_type != 'qweb-pdf' or use_company_watermark"
                     groups="base.group_no_one"
                 />
                 <field
                     name="pdf_watermark"
-                    attrs="{'invisible': ['|',('report_type', '!=', 'qweb-pdf'),('use_company_watermark', '=', True)]}"
+                    invisible="report_type != 'qweb-pdf' or use_company_watermark"
                     widget="pdf_viewer"
                 />
             </field>