From e82a00cf529bbb9284e4de1f1de89fcaf6829613 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 27 Mar 2012 17:45:17 +0530 Subject: [PATCH 1/3] [IMP] Reporting: add the configuration wizard bzr revid: jap@tinyerp.com-20120327121517-ueys9efvabb06b88 --- 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 | 34 +++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 addons/report_designer/res_config.py create mode 100644 addons/report_designer/res_config_view.xml diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py index 9a3d6d2fbb6..53c45089ddc 100644 --- a/addons/report_designer/__init__.py +++ b/addons/report_designer/__init__.py @@ -19,5 +19,6 @@ # ############################################################################## +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 f0559d8800c..69330a2a116 100644 --- a/addons/report_designer/__openerp__.py +++ b/addons/report_designer/__openerp__.py @@ -38,6 +38,7 @@ 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 new file mode 100644 index 00000000000..62b9b48e453 --- /dev/null +++ b/addons/report_designer/res_config.py @@ -0,0 +1,39 @@ +# -*- 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 new file mode 100644 index 00000000000..64e8aeb2e29 --- /dev/null +++ b/addons/report_designer/res_config_view.xml @@ -0,0 +1,34 @@ + + + + + Reporting Application + report.configuration + form + +
+ + + + + + + + + +
+ + + + Configure Reporting Application + ir.actions.act_window + report.configuration + + form + form + + + + + + From 41cf593c660d476889937edd7dca6930036b2c6e Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 2 Apr 2012 11:40:52 +0530 Subject: [PATCH 2/3] [IMP] Reporting: remove newline and set the group cols and colspan bzr revid: jap@tinyerp.com-20120402061052-2en7rlg6qagcfozs --- addons/report_designer/res_config_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/report_designer/res_config_view.xml b/addons/report_designer/res_config_view.xml index 64e8aeb2e29..129964acacf 100644 --- a/addons/report_designer/res_config_view.xml +++ b/addons/report_designer/res_config_view.xml @@ -8,11 +8,9 @@
- + - - From 0d801d28df4642be4863873faadf840f55f943ac Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 4 Apr 2012 12:47:31 +0530 Subject: [PATCH 3/3] [IMP] Reporting: move reporting wizard into base_setup module bzr revid: jap@tinyerp.com-20120404071731-trnfdvjnjrvp35s7 --- addons/base_setup/__init__.py | 1 + addons/base_setup/__openerp__.py | 2 +- addons/base_setup/res_config.py | 39 +++++++++++++++++++++++++++ addons/base_setup/res_config_view.xml | 32 ++++++++++++++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 addons/base_setup/res_config.py create mode 100644 addons/base_setup/res_config_view.xml diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 82fe6ca3601..e425344e380 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -20,5 +20,6 @@ ############################################################################## import base_setup +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index 093f2f492ff..aa322b5562f 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -36,7 +36,7 @@ Shows you a list of applications features to install from. 'website': 'http://www.openerp.com', 'depends': ['base'], 'init_xml': [], - 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ], + 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml','res_config_view.xml'], 'demo_xml': [], 'installable': True, 'auto_install': True, diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py new file mode 100644 index 00000000000..0253485a1cd --- /dev/null +++ b/addons/base_setup/res_config.py @@ -0,0 +1,39 @@ +# -*- 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 general_configuration(osv.osv_memory): + _name = 'general.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."""), + } + +general_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml new file mode 100644 index 00000000000..055aee8679d --- /dev/null +++ b/addons/base_setup/res_config_view.xml @@ -0,0 +1,32 @@ + + + + + Reporting Application + general.configuration + form + +
+ + + + + + + +
+ + + + Configure Reporting Application + ir.actions.act_window + general.configuration + + form + form + + + + + +