diff --git a/addons/event/__init__.py b/addons/event/__init__.py index d653a6d4081..fc0009f7381 100644 --- a/addons/event/__init__.py +++ b/addons/event/__init__.py @@ -23,3 +23,4 @@ import event import wizard import report import res_partner +import res_config diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index d31f408ab92..b5bcab082cf 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -47,6 +47,7 @@ Key Features 'event_data.xml', 'report/report_event_registration_view.xml', 'res_partner_view.xml', + 'res_config_view.xml', 'email_template.xml', 'views/event.xml', ], diff --git a/addons/event/res_config.py b/addons/event/res_config.py new file mode 100644 index 00000000000..215dc34f414 --- /dev/null +++ b/addons/event/res_config.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +from openerp.osv import fields, osv + +class event_config_settings(osv.TransientModel): + _name='marketing.config.settings' + _inherit='marketing.config.settings' + _columns = { + 'module_event_sale': fields.boolean( + 'Sale different type of ticket', + help='Install the event_sale module'), + 'module_website_event_track': fields.boolean( + 'Organize few days event with track,full agenda,own menu in website'), + } + diff --git a/addons/event/res_config_view.xml b/addons/event/res_config_view.xml new file mode 100644 index 00000000000..fecb77cd42e --- /dev/null +++ b/addons/event/res_config_view.xml @@ -0,0 +1,31 @@ + + + + + + marketing.config.settings + + +
+ + + +
+
+
+
+
+ + + diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml index 81db37cb53b..6d15ac883cf 100644 --- a/addons/marketing/res_config_view.xml +++ b/addons/marketing/res_config_view.xml @@ -12,26 +12,28 @@ or