summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-07-12 14:51:58 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-07-12 14:51:58 +0700
commitaf433cff0d3e3679ac03ab6b5228c80ef6d9f571 (patch)
tree08e70ef752bc0d2eeaed048b895216cfe0a01a91
parent22592c56c5bf934dd0f95804d37e052270e27c63 (diff)
fix report
-rwxr-xr-xjasper_reports/controllers/main.py3
-rwxr-xr-xjasper_reports/models/report_xml.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/jasper_reports/controllers/main.py b/jasper_reports/controllers/main.py
index 5e5e36f..4400416 100755
--- a/jasper_reports/controllers/main.py
+++ b/jasper_reports/controllers/main.py
@@ -120,8 +120,7 @@ class ReportController(report.ReportController):
ids = [int(x) for x in docids.split(",")]
obj = request.env[report.model].browse(ids)
if report.print_report_name and not len(obj) > 1:
- # report_name = safe_eval(report.print_report_name, {'object': obj, 'time': time})
- report_name = safe_eval('Testingg', {'object': obj, 'time': time})
+ 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)
diff --git a/jasper_reports/models/report_xml.py b/jasper_reports/models/report_xml.py
index db3f96e..304e1f5 100755
--- a/jasper_reports/models/report_xml.py
+++ b/jasper_reports/models/report_xml.py
@@ -131,8 +131,7 @@ class ReportXml(models.Model):
'''
attachment_obj = self.env['ir.attachment']
for report in self:
- # attachment_name = str(report.name) + '.' + report.jasper_output
- attachment_name = 'Testingg' + '.' + report.jasper_output
+ attachment_name = str(report.name) + '.' + report.jasper_output
if report.attachment:
attachment_name = safe_eval(
report.attachment, {'object': record, 'time': time})