diff options
| author | Julien De Coster <jdc@odoo.com> | 2015-01-16 17:34:34 +0100 |
|---|---|---|
| committer | Julien De Coster <jdc@odoo.com> | 2015-01-21 10:05:48 +0100 |
| commit | f3e7cd1c0e4982086254fbb8189802b4f4260c7a (patch) | |
| tree | 1ba0a45df5483975d69883487858818019ae0d39 /addons/base_setup | |
| parent | fe352d673f9fef8841b42d1bc0d479a392c468db (diff) | |
[FIX] Mass mailing and marketing campaign glitch
1. Remove the mass mailing install checkbox from marketing and sales settings
2. Show the mass mailing settings only when the module is installed
3. Remove the marketing campaign install checkbox from marketing settings
4. Move the marketing_crm module into marketing_campaign
5. Merge the *.po files from marketing_crm with marketing_campaign
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/res_config.py | 3 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 7742f19d77e..0b48f30b58b 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -90,7 +90,4 @@ class sale_config_settings(osv.osv_memory): help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""), 'module_crm': fields.boolean('CRM'), 'module_sale' : fields.boolean('SALE'), - 'module_mass_mailing': fields.boolean( - 'Manage mass mailing campaigns', - help='Get access to statistics with your mass mailing, manage campaigns.'), } diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index b0fc6cad48c..919b85fe57b 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -137,10 +137,6 @@ <field name="module_web_linkedin"/> <label for="module_web_linkedin"/> </div> - <div> - <field name="module_mass_mailing" class="oe_inline"/> - <label for="module_mass_mailing"/> - </div> </div> </group> </div> |