Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] [16.0] jasper_reports: improved code #159

Open
wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

[IMP] [16.0] jasper_reports: improved code #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions jasper_reports/controllers/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from odoo.tools import html_escape
from odoo.tools.safe_eval import safe_eval, time


class ReportController(report.ReportController):

@route()
Expand Down Expand Up @@ -77,9 +78,8 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
return super(ReportController, self).report_routes(
reportname, docids, converter, **data)


@route()
def report_download(self, data, token, context=None):
def report_download(self, data, context=None, token=None):
"""This function is used by 'action_manager_report.js' in order to trigger the download of
a pdf/controller report.

Expand All @@ -94,7 +94,7 @@ def report_download(self, data, token, context=None):
converter = 'jasper'
extension = 'pdf'
pattern = '/report/jasper/'

reportname = url.split(pattern)[1].split('?')[0]

docids = None
Expand Down Expand Up @@ -123,7 +123,6 @@ def report_download(self, data, token, context=None):
report_name = safe_eval(report.print_report_name, {'object': obj, 'time': time})
filename = "%s.%s" % (report_name, extension)
response.headers.add('Content-Disposition', content_disposition(filename))
response.set_cookie('fileToken', token)
return response
except Exception as e:
se = _serialize_exception(e)
Expand All @@ -134,5 +133,5 @@ def report_download(self, data, token, context=None):
}
return request.make_response(html_escape(json.dumps(error)))
else:
return super(ReportController, self).report_download(data, token, context)
return super(ReportController, self).report_download(data, context, token)

Binary file modified jasper_reports/custom_reports/sale_order_report.jasper
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion jasper_reports/custom_reports/sale_order_report.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="OPENERP_RELATIONS" value="[&apos;order_line&apos;]"/>
<property name="ODOO_RELATIONS" value="[&apos;order_line&apos;]"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Jasper Quotation XML"/>
<property name="com.jaspersoft.studio.unit." value="pixel"/>
<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
Expand Down
5 changes: 3 additions & 2 deletions jasper_reports/models/report_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,9 @@ def _get_report_from_name(self, report_name):
@api.model
def create(self, values):
if self._context and self._context.get('jasper_report'):
values['model'] = \
self.env['ir.model'].browse(values['model_id']).model
if 'model_id' in values:
values['model'] = \
self.env['ir.model'].browse(values['model_id']).model
values['type'] = 'ir.actions.report'
values['report_type'] = 'jasper'
values['jasper_report'] = True
Expand Down