Skip to content

Commit

Permalink
[14.0][MIG] report_xlsx_helper
Browse files Browse the repository at this point in the history
  • Loading branch information
Saran440 committed Nov 19, 2020
1 parent f4edd69 commit e928294
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion report_xlsx_helper/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "Noviat, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/reporting-engine",
"category": "Reporting",
"version": "13.0.1.1.0",
"version": "14.0.1.0.0",
"license": "AGPL-3",
"depends": ["report_xlsx"],
"installable": True,
Expand Down
6 changes: 2 additions & 4 deletions report_xlsx_helper/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
context.update(data["context"])
context["report_name"] = reportname

xlsx = report.with_context(context).render_xlsx(docids, data=data)[0]
xlsx = report.with_context(context)._render_xlsx(docids, data=data)[0]
report_file = context.get("report_file")
if not report_file:
active_model = context.get("active_model", "export")
Expand All @@ -52,6 +52,4 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
("Content-Disposition", content_disposition(report_file + ".xlsx")),
]
return request.make_response(xlsx, headers=xlsxhttpheaders)
return super(ReportController, self).report_routes(
reportname, docids, converter, **data
)
return super().report_routes(reportname, docids, converter, **data)
4 changes: 2 additions & 2 deletions report_xlsx_helper/models/ir_actions_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class IrActionsReport(models.Model):
_inherit = "ir.actions.report"

@api.model
def render_xlsx(self, docids, data):
def _render_xlsx(self, docids, data):
if not self and self.env.context.get("report_name"):
report_model_name = "report.{}".format(self.env.context["report_name"])
report_model = self.env.get(report_model_name)
if report_model is None:
raise UserError(_("%s model was not found" % report_model_name))
return report_model.create_xlsx_report(docids, data)
return super(IrActionsReport, self).render_xlsx(docids, data)
return super()._render_xlsx(docids, data)
2 changes: 2 additions & 0 deletions report_xlsx_helper/report/report_xlsx_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
from odoo import _, fields, models
from odoo.exceptions import UserError

_xxx = {}


class ReportXlsxAbstract(models.AbstractModel):
_inherit = "report.report_xlsx.abstract"
Expand Down
2 changes: 1 addition & 1 deletion report_xlsx_helper/tests/test_report_xlsx_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ def setUp(self):
self.report = self.env["ir.actions.report"].with_context(ctx)

def test_report_xlsx_helper(self):
report_xls = self.report.render_xlsx(None, None)
report_xls = self.report._render_xlsx(None, None)
self.assertEqual(report_xls[1], "xlsx")
1 change: 1 addition & 0 deletions setup/report_xlsx_helper/odoo/addons/report_xlsx_helper
6 changes: 6 additions & 0 deletions setup/report_xlsx_helper/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

0 comments on commit e928294

Please sign in to comment.