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 PR #616 into 14.0

Browse Source 
Signed-off-by etobella
This commit is contained in:
OCA-git-bot
2022-04-21 12:23:53 +00:00
parent 4173898e81 c44cbc883f
commit 99d05f2d0e
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
report_py3o/__manifest__.py
View File

@@ -10,7 +10,10 @@
"author": "XCG Consulting," "ACSONE SA/NV," "Odoo Community Association (OCA)", "author": "XCG Consulting," "ACSONE SA/NV," "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/reporting-engine", "website": "https://github.com/OCA/reporting-engine",
"depends": ["web"], "depends": ["web"],
"external_dependencies": {"python": ["py3o.template", "py3o.formats", "PyPDF2"]}, "external_dependencies": {
"python": ["py3o.template", "py3o.formats", "PyPDF2"],
"deb": ["libreoffice"],
},
"data": [ "data": [
"security/ir.model.access.csv", "security/ir.model.access.csv",
"views/menu.xml", "views/menu.xml",

5
report_qweb_signer/__manifest__.py
View File

@@ -13,7 +13,10 @@
"license": "AGPL-3", "license": "AGPL-3",
"installable": True, "installable": True,
"depends": ["web_editor"], "depends": ["web_editor"],
"external_dependencies": {"python": ["endesive", "cryptography"]}, "external_dependencies": {
"python": ["endesive", "cryptography"],
"deb": ["default-jre-headless"],
},
"data": [ "data": [
"data/defaults.xml", "data/defaults.xml",
"security/ir.model.access.csv", "security/ir.model.access.csv",

2
report_qweb_signer/models/ir_actions_report.py
View File

@@ -42,7 +42,7 @@ class IrActionsReport(models.Model):
if res_ids: if res_ids:
obj = self.env[self.model].browse(res_ids[0]) obj = self.env[self.model].browse(res_ids[0])
if "company_id" in obj: if "company_id" in obj:
company_id = obj.company_id.id company_id = obj.company_id.id or company_id
certificates = self.env["report.certificate"].search( certificates = self.env["report.certificate"].search(
[ [
("company_id", "=", company_id), ("company_id", "=", company_id),