Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-v62_reporting_config-jap into
lp:~openerp-dev/openobject-addons/trunk-v62_config.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_reporting_config-jap/+merge/100922
Hello,
[ADD]: Added new configuration wizard for Reporting.
Thanks,
JAP
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_reporting_config-jap/+merge/100922
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-v62_reporting_config-jap into
lp:~openerp-dev/openobject-addons/trunk-v62_config.
=== modified file 'base_setup/__init__.py'
--- base_setup/__init__.py 2011-08-19 01:13:12 +0000
+++ base_setup/__init__.py 2012-04-05 07:30:40 +0000
@@ -20,5 +20,6 @@
##############################################################################
import base_setup
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'base_setup/__openerp__.py'
--- base_setup/__openerp__.py 2012-01-31 13:36:57 +0000
+++ base_setup/__openerp__.py 2012-04-05 07:30:40 +0000
@@ -36,7 +36,7 @@
'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,
=== added file 'base_setup/res_config.py'
--- base_setup/res_config.py 1970-01-01 00:00:00 +0000
+++ base_setup/res_config.py 2012-04-05 07:30:40 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+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
=== added file 'base_setup/res_config_view.xml'
--- base_setup/res_config_view.xml 1970-01-01 00:00:00 +0000
+++ base_setup/res_config_view.xml 2012-04-05 07:30:40 +0000
@@ -0,0 +1,32 @@
+<openerp>
+ <data>
+
+ <record id="view_reporting_configuration" model="ir.ui.view">
+ <field name="name">Reporting Application</field>
+ <field name="model">general.configuration</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string ="Reporting Application">
+ <separator string="Reports" colspan="4"/>
+ <group colspan="4" col="4">
+ <field name="module_base_report_designer"/>
+ <field name="module_report_webkit"/>
+ <field name="module_report_webkit_sample"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <record id="action_reporting_configuration" model="ir.actions.act_window">
+ <field name="name">Configure Reporting Application</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">general.configuration</field>
+ <field name="view_id" ref="view_reporting_configuration"/>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ </record>
+
+ <menuitem id="menu_reporting_configuration" name="Reporting" parent="base.menu_config" sequence="9" action="action_reporting_configuration"/>
+
+ </data>
+</openerp>
=== modified file 'report_designer/__init__.py'
--- report_designer/__init__.py 2011-10-11 20:05:49 +0000
+++ report_designer/__init__.py 2012-04-05 07:30:40 +0000
@@ -19,5 +19,6 @@
#
##############################################################################
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'report_designer/__openerp__.py'
--- report_designer/__openerp__.py 2012-02-23 15:40:58 +0000
+++ report_designer/__openerp__.py 2012-04-05 07:30:40 +0000
@@ -38,6 +38,7 @@
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
+ 'res_config_view.xml',
],
'demo_xml': [],
'installable': True,
=== added file 'report_designer/res_config.py'
--- report_designer/res_config.py 1970-01-01 00:00:00 +0000
+++ report_designer/res_config.py 2012-04-05 07:30:40 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+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
=== added file 'report_designer/res_config_view.xml'
--- report_designer/res_config_view.xml 1970-01-01 00:00:00 +0000
+++ report_designer/res_config_view.xml 2012-04-05 07:30:40 +0000
@@ -0,0 +1,32 @@
+<openerp>
+ <data>
+
+ <record id="view_reporting_configuration" model="ir.ui.view">
+ <field name="name">Reporting Application</field>
+ <field name="model">report.configuration</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string ="Reporting Application">
+ <separator string="Reports" colspan="4"/>
+ <group colspan="4" col="4">
+ <field name="module_base_report_designer"/>
+ <field name="module_report_webkit"/>
+ <field name="module_report_webkit_sample"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <record id="action_reporting_configuration" model="ir.actions.act_window">
+ <field name="name">Configure Reporting Application</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">report.configuration</field>
+ <field name="view_id" ref="view_reporting_configuration"/>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ </record>
+
+ <menuitem id="menu_reporting_configuration" name="Reporting" parent="base.menu_config" sequence="9" action="action_reporting_configuration"/>
+
+ </data>
+</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
