From 541784013678f49eb1e64455f41c6dd9819418dc Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 20 Apr 2012 11:28:34 +0200 Subject: [PATCH] [IMP] move the reporting config wizard to base_setup bzr revid: rco@openerp.com-20120420092834-4n6v0c6f8rws16oi --- addons/base_setup/res_config.py | 22 ++++++++++-- addons/base_setup/res_config_view.xml | 31 ++++++++++++++++- addons/report_designer/__init__.py | 1 - addons/report_designer/__openerp__.py | 1 - addons/report_designer/res_config.py | 39 ---------------------- addons/report_designer/res_config_view.xml | 32 ------------------ 6 files changed, 50 insertions(+), 76 deletions(-) delete mode 100644 addons/report_designer/res_config.py delete mode 100644 addons/report_designer/res_config_view.xml diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index f54b717fc3f..5031a608099 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -21,10 +21,9 @@ from osv import osv, fields -class general_configuration(osv.osv_memory): +class base_config_settings(osv.osv_memory): _name = 'base.config.settings' _inherit = 'res.config.settings' - _columns = { 'module_multi_company': fields.boolean('Multi Company', help="""Work in multi-company environments, with appropriate security access between companies. @@ -38,4 +37,23 @@ class general_configuration(osv.osv_memory): This installs the module share."""), } + + +class report_config_settings(osv.osv_memory): + _name = 'report.config.settings' + _inherit = 'res.config.settings' + _columns = { + 'module_base_report_designer': fields.boolean('Customize your OpenERP Reports with OpenOffice', + help ="""Import/export OpenERP reports that you can modify with OpenOffice. + New and modified reports can be uploaded to OpenERP thanks to the provided OpenOffice plugin. + This installs the module base_report_designer."""), + 'module_report_webkit': fields.boolean('Design OpenERP Reports in HTML', + help ="""Design OpenERP reports with a report engine based on the WebKit library (http://www.webkit.org). + Reports are defined in HTML and the report generation is customized with CSS. + This installs the module report_webkit."""), + 'module_report_webkit_sample': fields.boolean('Samples of HTML Reports', + help ="""Install a sample invoice report defined in HTML. + This installs the module report_webkit_sample."""), + } + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 2d4ed04608b..a7a665f89ef 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -30,9 +30,38 @@ form inline - + + Configure Reporting + report.config.settings + form + +
+
+
+ + + + + + + +
+ + + + + Configure Reporting + report.config.settings + form + inline + + + diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py index 53c45089ddc..9a3d6d2fbb6 100644 --- a/addons/report_designer/__init__.py +++ b/addons/report_designer/__init__.py @@ -19,6 +19,5 @@ # ############################################################################## -import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py index 69330a2a116..f0559d8800c 100644 --- a/addons/report_designer/__openerp__.py +++ b/addons/report_designer/__openerp__.py @@ -38,7 +38,6 @@ modules like base_report_designer and base_report_creator. 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'res_config_view.xml', ], 'demo_xml': [], 'installable': True, diff --git a/addons/report_designer/res_config.py b/addons/report_designer/res_config.py deleted file mode 100644 index 62b9b48e453..00000000000 --- a/addons/report_designer/res_config.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import fields, osv - -class report_configuration(osv.osv_memory): - _name = 'report.configuration' - _inherit = 'res.config.settings' - - _columns = { - 'module_base_report_designer': fields.boolean('Customise your OpenERP Report with OpenOffice', - help ="""It installs the base_report_designer module."""), - 'module_report_webkit': fields.boolean('Design OpenERP report in HTML', - help ="""It installs the report_webkit module."""), - 'module_report_webkit_sample': fields.boolean('Samples of HTML report design', - help ="""It installs the report_webkit_sample module."""), - } - -report_configuration() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/report_designer/res_config_view.xml b/addons/report_designer/res_config_view.xml deleted file mode 100644 index 129964acacf..00000000000 --- a/addons/report_designer/res_config_view.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Reporting Application - report.configuration - form - -
- - - - - - - -
- - - - Configure Reporting Application - ir.actions.act_window - report.configuration - - form - form - - - - - -