Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #577 into 15.0 

Signed-off-by pedrobaeza
pull/583/head
OCA-git-bot 2022-01-18 15:29:38 +00:00
parent b7a89c8ad0 497dd50e7c
commit dbfe1b0831
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
report_xlsx/__manifest__.py
View File

@ -6,7 +6,7 @@
"author": "ACSONE SA/NV," "Creu Blanca," "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/reporting-engine",
"category": "Reporting",
"version": "15.0.1.0.1",
"version": "15.0.1.0.2",
"development_status": "Production/Stable",
"license": "AGPL-3",
"external_dependencies": {"python": ["xlsxwriter", "xlrd"]},

18
report_xlsx/controllers/main.py
View File

@ -24,16 +24,16 @@ _logger = logging.getLogger(__name__)
class ReportController(report.ReportController):
@route()
def report_routes(self, reportname, docids=None, converter=None, **data):
report = request.env["ir.actions.report"]._get_report_from_name(reportname)
context = dict(request.env.context)
if docids:
docids = [int(i) for i in docids.split(",")]
if data.get("options"):
data.update(json.loads(data.pop("options")))
if data.get("context"):
data["context"] = json.loads(data["context"])
context.update(data["context"])
if converter == "xlsx":
report = request.env["ir.actions.report"]._get_report_from_name(reportname)
context = dict(request.env.context)
if docids:
docids = [int(i) for i in docids.split(",")]
if data.get("options"):
data.update(json.loads(data.pop("options")))
if data.get("context"):
data["context"] = json.loads(data["context"])
context.update(data["context"])
xlsx = report.with_context(**context)._render_xlsx(docids, data=data)[0]
xlsxhttpheaders = [
(

3
report_xlsx/static/src/js/report/action_manager_report.esm.js
View File

@ -48,6 +48,7 @@ registry
} else if (onClose) {
onClose();
}
return Promise.resolve(true);
}
return Promise.resolve(true);
return Promise.resolve(false);
});