diff --git a/addons/mass_mailing/models/mailing.py b/addons/mass_mailing/models/mailing.py index d12930f926f..ad3ebde9acc 100644 --- a/addons/mass_mailing/models/mailing.py +++ b/addons/mass_mailing/models/mailing.py @@ -294,7 +294,7 @@ class MassMailing(models.Model): self.write({'state': 'in_queue'}) def action_cancel(self): - self.write({'state': 'draft', 'schedule_date': False}) + self.write({'state': 'draft', 'schedule_date': False, 'next_departure': False}) def action_retry_failed(self): failed_mails = self.env['mail.mail'].sudo().search([ diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.ui.scss b/addons/mass_mailing/static/src/scss/mass_mailing.ui.scss index e39e04498e6..a9c84da00f0 100644 --- a/addons/mass_mailing/static/src/scss/mass_mailing.ui.scss +++ b/addons/mass_mailing/static/src/scss/mass_mailing.ui.scss @@ -199,6 +199,10 @@ body.editor_enable.o_basic_theme.o_in_iframe { .oe_structure { width: 100%; + @media (max-width: map-get($grid-breakpoints, 'lg')) { + width: auto; + margin-left: $o-we-sidebar-width; + } } :root { diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml index 577d71f07a4..e52171c1ba1 100644 --- a/addons/mass_mailing/views/mailing_mailing_views.xml +++ b/addons/mass_mailing/views/mailing_mailing_views.xml @@ -277,6 +277,8 @@ + + @@ -322,13 +324,14 @@ -
+
- / Delivered to + / Delivered to + Mailing Contact
-
+
% Opened
@@ -342,15 +345,24 @@
- - - + + + - - + + + + + + Mailing Contact + + + Next Batch +