summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/models/__init__.py
diff options
context:
space:
mode:
authorTiffany Chang (tic) <tic@odoo.com>2020-01-13 09:32:54 +0000
committerTiffany Chang (tic) <tic@odoo.com>2020-01-21 12:37:58 +0000
commitabaae1e46357f41905a5e20535576984023e7b5b (patch)
treef28dcb64c1b42304ef1888d5ea3c87a5cf46b32c /addons/mass_mailing/models/__init__.py
parent1d13928764defd91d4ec2b2ce9af238a591c7c30 (diff)
[IMP] mass_mailing_(sms): split systray activities
Due to 'mass_mailing_sms' inheriting mailing.mailing from 'mass_mailing', activities for these two modules would show up as one "Mass Mailing" line in the systray. This commit adds additional logic to remove this "Mass Mailing" line and replace it with 2 lines: "Email Marketing" and "SMS Marketing" with their appropriately matching module icon. For consistency, when only the 'mass_mailing' module is installed, it will still display "Email Marketing". Task: 2169498
Diffstat (limited to 'addons/mass_mailing/models/__init__.py')
-rw-r--r--addons/mass_mailing/models/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index 9797d43aeff..64b451ac37b 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -10,4 +10,5 @@ from . import mail_mail
from . import mail_template
from . import mail_thread
from . import res_config_settings
+from . import res_users
from . import utm