diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index f7483706643..a0d230ef214 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -68,9 +68,6 @@ TODO: 'demo': [ "report/webkit_report_demo.xml", ], - 'test': [ - "test/print.yml", - ], 'installable': True, 'auto_install': False, } diff --git a/addons/report_webkit/test/print.yml b/addons/report_webkit/test/print.yml deleted file mode 100644 index b906a991f64..00000000000 --- a/addons/report_webkit/test/print.yml +++ /dev/null @@ -1,11 +0,0 @@ -- - Print the report_webkit demo report. -- - !python {model: ir.actions.report.xml}: | - import os - from openerp import tools - from openerp.report import render_report - ids = self.pool['ir.actions.report.xml'].search(cr, uid, [], {}) - data, format = render_report(cr, uid, ids, 'webkit.ir.actions.report.xml', {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'report_webkit_demo_report.'+format), 'wb+').write(data) diff --git a/addons/report_webkit/tests/__init__.py b/addons/report_webkit/tests/__init__.py new file mode 100644 index 00000000000..51e4e74f936 --- /dev/null +++ b/addons/report_webkit/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import test_report_webkit diff --git a/addons/report_webkit/tests/test_report_webkit.py b/addons/report_webkit/tests/test_report_webkit.py new file mode 100644 index 00000000000..b37d93eabf2 --- /dev/null +++ b/addons/report_webkit/tests/test_report_webkit.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import os +import odoo.tests +from odoo import tools +from odoo.report import render_report + +class TestReportsWebkit(odoo.tests.TransactionCase): + + def test_report_webkit(self): + report_ids = self.env['ir.actions.report.xml'].search([]).ids + data, format = render_report(self.env.cr, self.env.uid, report_ids, 'webkit.ir.actions.report.xml', {}, context=self.env.context) + if tools.config['test_report_directory']: + file(os.path.join(tools.config['test_report_directory'], 'report_webkit_demo_report.' + format), 'wb+').write(data) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index c088feedfc1..cd5a5cc93d8 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -231,7 +231,7 @@ class IrActionsReportXml(models.Model): else: return self.env['report'].get_pdf(res_ids, report, data=data), 'pdf' else: - return report.create(data) + return report.create(self._cr, self._uid, res_ids, data, context=self._context) class IrActionsActWindow(models.Model):