From 274e94d7158b2f14c5f53cfbdf09a5435b3be163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 19 Aug 2016 15:13:45 +0200 Subject: [PATCH] [REF] event: remove group_mail_scheduling as email scheduling is part of event management In the interface using the email scheduler of events is limited to a group that is not activated by default. However by default emails are sent and therefore cannot be configured by the event maanger. As managers should always be able to configure sent emails we decided to remove the group and always give access to the email scheduling tab of the event form view. --- addons/event/models/event_config_settings.py | 6 ------ addons/event/security/event_security.xml | 5 ----- addons/event/views/event_config_settings_views.xml | 1 - addons/event/views/event_views.xml | 2 +- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/addons/event/models/event_config_settings.py b/addons/event/models/event_config_settings.py index 92ec85ef4b4..5637e72b531 100644 --- a/addons/event/models/event_config_settings.py +++ b/addons/event/models/event_config_settings.py @@ -26,12 +26,6 @@ class event_config_settings(models.TransientModel): (0, "Manually confirm every registration") ], "Auto Confirmation", help='Unselect this option to manually manage draft event and draft registration') - group_email_scheduling = fields.Selection([ - (0, "No automated emails"), - (1, 'Schedule emails to attendees and subscribers') - ], "Email Scheduling", - help='You will be able to configure emails, and to schedule them to be automatically sent to the attendees on registration and/or attendance', - implied_group='event.group_email_scheduling') module_event_barcode = fields.Boolean("Scan badges to confirm attendances", help="Install the event_barcode module") diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index ec9d5299f45..cf034f15bce 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -19,11 +19,6 @@ - - Schedule Emails on Event Registration - - - diff --git a/addons/event/views/event_config_settings_views.xml b/addons/event/views/event_config_settings_views.xml index 5e7e4343756..ddee7374813 100644 --- a/addons/event/views/event_config_settings_views.xml +++ b/addons/event/views/event_config_settings_views.xml @@ -16,7 +16,6 @@ -