diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py index 46a0a1e2476..2a14d2821ae 100644 --- a/addons/base_report_designer/__init__.py +++ b/addons/base_report_designer/__init__.py @@ -18,8 +18,9 @@ # along with this program. If not, see . # ############################################################################## - -import base_report_designer import wizard +import base_report_designer +import installer +import openerp_sxw2rml # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 50fe73f753f..9d39bba8a61 100644 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -36,8 +36,9 @@ upload the report using the same wizard. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': ['base_report_data.xml'], - 'update_xml': ['base_report_designer_wizard.xml'], + 'init_xml': ['security/base_report_security.xml', + 'wizard/base_report_design_view.xml'], + 'update_xml': ['base_report_designer_installer.xml'], 'demo_xml': [], 'installable': True, 'active': False, diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py index a4a135c4299..283c8ec7e23 100644 --- a/addons/base_report_designer/base_report_designer.py +++ b/addons/base_report_designer/base_report_designer.py @@ -20,13 +20,13 @@ ############################################################################## from osv import osv -from wizard.tiny_sxw2rml import sxw2rml +from openerp_sxw2rml import sxw2rml from StringIO import StringIO from report import interface import base64 import pooler import tools - +import addons class report_xml(osv.osv): _inherit = 'ir.actions.report.xml' @@ -37,12 +37,9 @@ class report_xml(osv.osv): ''' sxwval = StringIO(base64.decodestring(file_sxw)) if file_type=='sxw': - fp = tools.file_open('normalized_oo2rml.xsl', - subdir='addons/base_report_designer/wizard/tiny_sxw2rml') + fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb') if file_type=='odt': - fp = tools.file_open('normalized_odt2rml.xsl', - subdir='addons/base_report_designer/wizard/tiny_sxw2rml') - + fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb') return {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))} def upload_report(self, cr, uid, report_id, file_sxw, file_type, context): @@ -52,11 +49,9 @@ class report_xml(osv.osv): pool = pooler.get_pool(cr.dbname) sxwval = StringIO(base64.decodestring(file_sxw)) if file_type=='sxw': - fp = tools.file_open('normalized_oo2rml.xsl', - subdir='addons/base_report_designer/wizard/tiny_sxw2rml') + fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb') if file_type=='odt': - fp = tools.file_open('normalized_odt2rml.xsl', - subdir='addons/base_report_designer/wizard/tiny_sxw2rml') + fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb') report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], { 'report_sxw_content': base64.decodestring(file_sxw), 'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml new file mode 100644 index 00000000000..21537d3d63c --- /dev/null +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -0,0 +1,93 @@ + + + + + + + Form View: OpenERP Report Designer Installation + base_report_designer.installer + form + + + +
+ OpenERP Report Designer Configuration +
+ + OpenERP Report Designer + + + This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer. + + +