Hi all, I'm testing this module on the trunk. Below the changes I've done so far.
regards, Paul Stevens, [email protected]
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: http://bazaar.launchpad.net/~report-openoffice-\ # team/report-openoffice/trunk/ # testament_sha1: 2bd38bacc9b57b96fbe9eebb64777d0c7856adaf # timestamp: 2010-03-31 09:14:55 +0000 # base_revision_id: [email protected] # # Begin patch === modified file 'report_openoffice/DocumentConverter.py' --- report_openoffice/DocumentConverter.py 2010-01-22 14:49:35 +0000 +++ report_openoffice/DocumentConverter.py 2010-03-30 13:37:10 +0000 @@ -26,6 +26,7 @@ from com.sun.star.connection import NoConnectException from com.sun.star.io import XOutputStream from com.sun.star.io import IOException +from tools.translate import _ class DocumentConversionException(Exception): === modified file 'report_openoffice/report_openoffice.py' --- report_openoffice/report_openoffice.py 2010-03-22 12:49:58 +0000 +++ report_openoffice/report_openoffice.py 2010-03-31 09:09:45 +0000 @@ -39,6 +39,8 @@ from ExtraFunctions import ExtraFunctions from tools import debug +from tools.translate import _ +from utils import register_report class OpenOffice_parser(report_sxw): @@ -350,15 +352,6 @@ except Exception, e: return None -def register_report(name, model, tmpl_path, parser): - name = 'report.%s' % name - if netsvc.service_exist( name ): - #service = netsvc.SERVICES[name].parser - if isinstance( netsvc.SERVICES[name], OpenOffice_parser ): - return - del netsvc.SERVICES[name] - OpenOffice_parser(name, model, tmpl_path, parser=parser) - old_register_all = report.interface.register_all def new_register_all(db): value = old_register_all(db) === modified file 'report_openoffice/report_xml.py' --- report_openoffice/report_xml.py 2010-02-16 16:44:02 +0000 +++ report_openoffice/report_xml.py 2010-03-31 09:06:57 +0000 @@ -27,26 +27,12 @@ ############################################################################## from osv import osv,fields -import netsvc from report_openoffice import OpenOffice_parser, load_from_file, load_from_source from report.report_sxw import rml_parse import base64 import tools - - -def delete_report_service(name): - name = 'report.%s' % name - if netsvc.service_exist( name ): - del netsvc.SERVICES[name] - -def register_report(name, model, tmpl_path, parser): - name = 'report.%s' % name - if netsvc.service_exist( name ): - #service = netsvc.SERVICES[name].parser - #if isinstance( netsvc.SERVICES[name], OpenOffice_parser ): - # return - del netsvc.SERVICES[name] - OpenOffice_parser(name, model, tmpl_path, parser=parser) +from tools.translate import _ +from utils import register_report, delete_report_service class res_company(osv.osv): _name = 'res.company' @@ -121,6 +107,7 @@ register_report( vals['report_name'], vals['model'], vals['report_rml'], parser) except Exception, e: raise osv.except_osv(_('Report registration error !'), _('Report was not registered in system !')) + res_id = super(report_xml, self).create(cr, user, vals, context) return res_id === added file 'report_openoffice/utils.py' --- report_openoffice/utils.py 1970-01-01 00:00:00 +0000 +++ report_openoffice/utils.py 2010-03-31 09:06:57 +0000 @@ -0,0 +1,40 @@ +############################################################################## +# +# Copyright (c) 2008-2009 SIA "KN dati". (http://kndati.lv) All Rights Reserved. +# General contacts <[email protected]> +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +from report_openoffice import OpenOffice_parser +import netsvc + +def delete_report_service(name): + name = 'report.%s' % name + netsvc.Service(name).remove(name) + +def register_report(name, model, tmpl_path, parser): + name = 'report.%s' % name + netsvc.Service(name).remove(name) + OpenOffice_parser(name, model, tmpl_path, parser=parser) + # Begin bundle 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 WN5RwA==
_______________________________________________ Mailing list: https://launchpad.net/~report-openoffice-team Post to : [email protected] Unsubscribe : https://launchpad.net/~report-openoffice-team More help : https://help.launchpad.net/ListHelp
