From 45e10ba3b1a757b9534453e8a50939eee28dcda0 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 27 Mar 2012 14:48:54 +0530 Subject: [PATCH 1/3] [IMP] Marketing: add the configuration wizard bzr revid: jap@tinyerp.com-20120327091854-541dh2fpygomlw3i --- addons/marketing/__init__.py | 1 + addons/marketing/__openerp__.py | 3 +- addons/marketing/res_config.py | 41 ++++++++++++++++++++++++++++ addons/marketing/res_config_view.xml | 37 +++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 addons/marketing/res_config.py create mode 100644 addons/marketing/res_config_view.xml diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py index e68279cad8d..2366f61813b 100644 --- a/addons/marketing/__init__.py +++ b/addons/marketing/__init__.py @@ -19,6 +19,7 @@ # ############################################################################## +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index c097c22b84e..8088a0a1a1b 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -38,7 +38,8 @@ Contains the installer for marketing-related modules. 'update_xml': [ 'security/marketing_security.xml', 'security/ir.model.access.csv', - 'marketing_view.xml' + 'marketing_view.xml', + 'res_config_view.xml', ], 'demo_xml': ['marketing_demo.xml'], 'installable': True, diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py new file mode 100644 index 00000000000..996b7ab882f --- /dev/null +++ b/addons/marketing/res_config.py @@ -0,0 +1,41 @@ +# -*- 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 marketing_configuration(osv.osv_memory): + _name = 'marketing.configuration' + _inherit = 'res.config.settings' + + _columns = { + 'module_marketing': fields.boolean('Marketing', + help ="""It installs the marketing_campaign module."""), + 'module_marketing_campaign': fields.boolean('Marketing Campaign', + help ="""It installs the marketing_campaign module."""), + 'module_marketing_campaign_crm_demo': fields.boolean('Demo data for the module Marketing Campaign', + help ="""It installs the marketing_campaign_crm_demo module."""), + 'module_crm_profiling': fields.boolean('Track customer profile to focus your campaigns', + help ="""It install the crm_profiling module."""), + } + +marketing_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml new file mode 100644 index 00000000000..c87969ca3f6 --- /dev/null +++ b/addons/marketing/res_config_view.xml @@ -0,0 +1,37 @@ + + + + + Marketing Application + marketing.configuration + form + +
+ + + + + + + + + + + + +
+ + + + Configure Marketing Application + ir.actions.act_window + marketing.configuration + + form + form + + + + + + From 368ea54a148c2808a71fcbf3fb0656dfdb685c02 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 2 Apr 2012 11:22:26 +0530 Subject: [PATCH 2/3] [IMP] Marketing: remove newline and set the group cols and colspan bzr revid: jap@tinyerp.com-20120402055226-93t79bgr1ucd7dpa --- addons/marketing/res_config_view.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml index c87969ca3f6..c3497a689a8 100644 --- a/addons/marketing/res_config_view.xml +++ b/addons/marketing/res_config_view.xml @@ -8,14 +8,9 @@
- + - - - - - From b32af21bd919a52c57088e409d8193c395311808 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 4 Apr 2012 11:55:03 +0530 Subject: [PATCH 3/3] [IMP] Marketing: improve usability for Marketing wizard bzr revid: jap@tinyerp.com-20120404062503-2gpp6l5vl99jrjg7 --- addons/marketing/res_config.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py index 996b7ab882f..ba1ebe9c9ca 100644 --- a/addons/marketing/res_config.py +++ b/addons/marketing/res_config.py @@ -24,18 +24,14 @@ from osv import fields, osv class marketing_configuration(osv.osv_memory): _name = 'marketing.configuration' _inherit = 'res.config.settings' - _columns = { - 'module_marketing': fields.boolean('Marketing', + 'module_marketing_campaign': fields.boolean('Marketing Campaigns', help ="""It installs the marketing_campaign module."""), - 'module_marketing_campaign': fields.boolean('Marketing Campaign', - help ="""It installs the marketing_campaign module."""), - 'module_marketing_campaign_crm_demo': fields.boolean('Demo data for the module Marketing Campaign', + 'module_marketing_campaign_crm_demo': fields.boolean('Demo data for the module Marketing Campaigns', help ="""It installs the marketing_campaign_crm_demo module."""), 'module_crm_profiling': fields.boolean('Track customer profile to focus your campaigns', help ="""It install the crm_profiling module."""), } - marketing_configuration() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file