From 676189cbf74796c945cec70023d24192e34e1ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 13 Mar 2014 13:05:03 +0100 Subject: [PATCH] [REF] [ADD] marketing: marketing config + CRM-related stuff module reordering - marketing module now holds only the basic stuff for marketing related modules: mainly marketing settings + menu definition - marketing_crm new module is a bridge between crm and marketing and holds the crm-related stuff previously present in marketing module. bzr revid: tde@openerp.com-20140313120503-rgvs8uysr0c6zv11 --- addons/marketing/__init__.py | 6 +-- addons/marketing/__openerp__.py | 24 +----------- addons/marketing/marketing_view.xml | 35 +----------------- addons/marketing/res_config.py | 37 ++++--------------- addons/marketing/res_config_view.xml | 25 +++++++------ addons/marketing/security/ir.model.access.csv | 1 - addons/marketing_crm/__init__.py | 22 +++++++++++ addons/marketing_crm/__openerp__.py | 20 ++++++++++ addons/marketing_crm/models/__init__.py | 3 ++ addons/marketing_crm/models/res_config.py | 19 ++++++++++ addons/marketing_crm/views/crm.xml | 36 ++++++++++++++++++ addons/marketing_crm/views/res_config.xml | 24 ++++++++++++ 12 files changed, 151 insertions(+), 101 deletions(-) delete mode 100644 addons/marketing/security/ir.model.access.csv create mode 100644 addons/marketing_crm/__init__.py create mode 100644 addons/marketing_crm/__openerp__.py create mode 100644 addons/marketing_crm/models/__init__.py create mode 100644 addons/marketing_crm/models/res_config.py create mode 100644 addons/marketing_crm/views/crm.xml create mode 100644 addons/marketing_crm/views/res_config.xml diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py index ff0c032da87..4a36da0182f 100644 --- a/addons/marketing/__init__.py +++ b/addons/marketing/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2004-TODAY OpenERP SA (http://www.openerp.com) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index e46c58b9959..696a51662ab 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -1,29 +1,9 @@ # -*- 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 . -# -############################################################################## - { 'name': 'Marketing', 'version': '1.1', - 'depends': ['base', 'base_setup', 'crm'], + 'depends': ['base', 'base_setup'], 'author': 'OpenERP SA', 'category': 'Hidden/Dependency', 'description': """ @@ -35,7 +15,6 @@ Contains the installer for marketing-related modules. 'website': 'http://www.openerp.com', 'data': [ 'security/marketing_security.xml', - 'security/ir.model.access.csv', 'marketing_view.xml', 'res_config_view.xml', ], @@ -44,4 +23,3 @@ Contains the installer for marketing-related modules. 'auto_install': False, 'images': ['images/config_marketing.jpeg'], } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 88ef93916b6..d42cc3b5f58 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -3,39 +3,8 @@ - + - - crm.lead.inherit.form - crm.lead - - - - Marketing - - - - - - - - - - - crm.lead.inherit.form - crm.lead - - - - - - - - - - diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py index a58a5c56fc7..6e3e1b9d69b 100644 --- a/addons/marketing/res_config.py +++ b/addons/marketing/res_config.py @@ -1,40 +1,19 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Business Applications -# Copyright (C) 2004-2012 OpenERP S.A. (). -# -# 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 openerp.osv import fields, osv -class marketing_config_settings(osv.osv_memory): + +class marketing_config_settings(osv.TransientModel): _name = 'marketing.config.settings' _inherit = 'res.config.settings' _columns = { - 'module_marketing_campaign': fields.boolean('Marketing campaigns', + 'module_mass_mailing': fields.boolean( + 'Mass Mailing', + help='Provide a way to perform mass mailings.\n' + '-This installs the module mass_mailing.'), + 'module_marketing_campaign': fields.boolean( + 'Marketing campaigns', help='Provides leads automation through marketing campaigns. ' 'Campaigns can in fact be defined on any resource, not just CRM leads.\n' '-This installs the module marketing_campaign.'), - 'module_marketing_campaign_crm_demo': fields.boolean('Demo data for marketing campaigns', - help='Installs demo data like leads, campaigns and segments for Marketing Campaigns.\n' - '-This installs the module marketing_campaign_crm_demo.'), - 'module_crm_profiling': fields.boolean('Track customer profile to focus your campaigns', - help='Allows users to perform segmentation within partners.\n' - '-This installs the module crm_profiling.'), } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml index 78144843f82..d241fa41513 100644 --- a/addons/marketing/res_config_view.xml +++ b/addons/marketing/res_config_view.xml @@ -11,24 +11,25 @@