audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from StefanRijnhart/fix/10.0/report_qweb_pdf_watermark/invalid_report_models

Browse Source 
[FIX] Don't break printing some upstream reports with invalid models
This commit is contained in:
Pedro M. Baeza
2018-03-09 09:34:03 +01:00
committed by GitHub
parent e3e7f7c7b7 5e2ae41852
commit 8c1adbff48
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
report_qweb_pdf_watermark/__manifest__.py
View File

@@ -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",

4
report_qweb_pdf_watermark/models/report.py
View File

@@ -34,9 +34,9 @@ class Report(models.Model):
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: