From cff89b09a48cb9a266b9beb36a515f8d502e12c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Mon, 23 Sep 2019 13:50:12 +0000
Subject: [PATCH 01/11] [FIX] mail: make recipients unique when parsing emails

Purpose of this commit is to have recipients of an incoming email being
present only once in recipients / to. Indeed there is no need to have
duplicate entries, for example if Delivered-To is set with same content
of To.

Followup of 7b79045fab809679e17d774f9a510e07ac39aa0b .

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/mail/models/mail_thread.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 5daf717e26f..101766fe9e2 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1384,7 +1384,7 @@ class MailThread(models.AbstractModel):
         msg_dict['cc'] = ','.join(email_cc_list) if email_cc_list else email_cc
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
-        msg_dict['recipients'] = ','.join(formatted_email
+        msg_dict['recipients'] = ','.join(set(formatted_email
             for address in [
                 tools.decode_message_header(message, 'Delivered-To'),
                 tools.decode_message_header(message, 'To'),
@@ -1392,14 +1392,15 @@ class MailThread(models.AbstractModel):
                 tools.decode_message_header(message, 'Resent-To'),
                 tools.decode_message_header(message, 'Resent-Cc')
             ] if address
-            for formatted_email in tools.email_split_and_format(address)
+            for formatted_email in tools.email_split_and_format(address))
         )
-        msg_dict['to'] = ','.join(formatted_email
+        msg_dict['to'] = ','.join(set(formatted_email
             for address in [
                 tools.decode_message_header(message, 'Delivered-To'),
                 tools.decode_message_header(message, 'To')
             ] if address
             for formatted_email in tools.email_split_and_format(address))
+        )
         partner_ids = [x.id for x in self._mail_find_partner_from_emails(tools.email_split(msg_dict['recipients']), records=self) if x]
         msg_dict['partner_ids'] = partner_ids
         # compute references to find if email_message is a reply to an existing thread

From 31aa195efa912eb315af62a22ad83fe83d25d5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 24 Sep 2019 12:17:22 +0000
Subject: [PATCH 02/11] [FIX] sms: set correct value of batch when contacting
 IAP sms

Batch of 10 text messages was ok for testing. Production environment should
be able to handle more of them.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/sms/models/sms_sms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sms/models/sms_sms.py b/addons/sms/models/sms_sms.py
index 256bebf7eda..081547426ce 100644
--- a/addons/sms/models/sms_sms.py
+++ b/addons/sms/models/sms_sms.py
@@ -86,7 +86,7 @@ class SmsSms(models.Model):
         return res
 
     def _split_batch(self):
-        batch_size = int(self.env['ir.config_parameter'].sudo().get_param('sms.session.batch.size', 10))
+        batch_size = int(self.env['ir.config_parameter'].sudo().get_param('sms.session.batch.size', 500))
         for sms_batch in tools.split_every(batch_size, self.ids):
             yield sms_batch
 

From e4ece3f7deaf86d8d39565d8acc106f250a05868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 24 Sep 2019 12:52:20 +0000
Subject: [PATCH 03/11] [FIX] mass_mailing: unlink traces when unlinking
 mailings

There is no need to keep traces when unlinking mailings, being mail or sms.
Indeed even with marketing automation unlinking mailings means traces will
be lost and won't serve any statistics or reporting purpose anymore.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/mass_mailing/models/mailing_trace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/models/mailing_trace.py b/addons/mass_mailing/models/mailing_trace.py
index 38185845545..ef3c51f0141 100644
--- a/addons/mass_mailing/models/mailing_trace.py
+++ b/addons/mass_mailing/models/mailing_trace.py
@@ -31,7 +31,7 @@ class MailingTrace(models.Model):
     model = fields.Char(string='Document model')
     res_id = fields.Integer(string='Document ID')
     # campaign / wave data
-    mass_mailing_id = fields.Many2one('mailing.mailing', string='Mailing', index=True)
+    mass_mailing_id = fields.Many2one('mailing.mailing', string='Mailing', index=True, ondelete='cascade')
     campaign_id = fields.Many2one(
         related='mass_mailing_id.campaign_id',
         string='Campaign',

From 889d30e2c80a561b41298a8fab52478c48b2c687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 24 Sep 2019 14:32:50 +0000
Subject: [PATCH 04/11] [FIX] mass_mailing_sms: make body required in sms
 mailings

Sending void SMS marketing is not considered as a valid use case, more
something we should prevent as each sent SMS consumes credits. Required
is put in view as we have to support void sms body for mail mailings.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/mass_mailing_sms/views/mailing_mailing_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 54d4c5375b2..61c14ce7228 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -90,7 +90,7 @@
             </xpath>
             <xpath expr="//page[@name='mail_body']" position="after">
                 <page string="SMS Content" name="sms_body" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">
-                    <field name="body_plaintext" widget="sms_widget"/>
+                    <field name="body_plaintext" widget="sms_widget" required="1"/>
                     <group>
                         <field name="sms_allow_unsubscribe"/>
                     </group>

From 48cc126137bb1abead26ca68ba8376cbd2cfe120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 24 Sep 2019 13:03:45 +0000
Subject: [PATCH 05/11] [FIX] (mass_mailing_)sms: allow to directly send SMS in
 mass mode

PURPOSE

Sending SMS is sometimes required as an immediate marketing tool.
Using delayed crons is not always the best user choice. Implement a
Send Now mechanism in batch SMS.

SPECIFICATIONS

Allow to send directly SMS when doing SMS marketing

SMS Application
  * in sms composer, in mass mode: rename Send SMS to Put in queue and
    add a Send Now button by-passing the queue;
  * set Put in queue as primary, Send Now as secondary;

SMS Marketing Application
  * in mailing view for SMS: rename Send SMS to Put in queue and
    add a Send Now button by-passing the queue;
  * set Put in queue as primary, Send Now as secondary;

Tests of SMS marketing with 400 contacts to SMS indicates it takes about
10 seconds to be completed which is considered as ok.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 .../models/mailing_mailing.py                 | 18 ++++++++++-----
 .../views/mailing_mailing_views.xml           | 11 ++++++---
 .../mass_mailing_sms/wizard/sms_composer.py   | 11 ++++-----
 addons/sms/wizard/sms_composer.py             | 23 ++++++++++++-------
 addons/sms/wizard/sms_composer_views.xml      |  7 +++++-
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py
index 49d7b6a0a3c..9200bf8618a 100644
--- a/addons/mass_mailing_sms/models/mailing_mailing.py
+++ b/addons/mass_mailing_sms/models/mailing_mailing.py
@@ -20,6 +20,8 @@ class Mailing(models.Model):
     sms_has_insufficient_credit = fields.Boolean(
         'Insufficient IAP credits', compute='_compute_sms_has_insufficient_credit',
         help='UX Field to propose to buy IAP credits')
+    sms_force_send = fields.Boolean(
+        'Send Directly', help='Use at your own risks.')
     # opt_out_link
     sms_allow_unsubscribe = fields.Boolean('Include opt-out link', default=True)
 
@@ -63,7 +65,15 @@ class Mailing(models.Model):
     # --------------------------------------------------
 
     def action_put_in_queue_sms(self):
-        return self.action_put_in_queue()
+        res = self.action_put_in_queue()
+        if self.sms_force_send:
+            self.action_send_mail()
+        return res
+
+    def action_send_now_sms(self):
+        if not self.sms_force_send:
+            self.write({'sms_force_send': True})
+        return self.action_send_mail()
 
     def action_test(self):
         if self.mailing_type == 'sms':
@@ -166,6 +176,7 @@ class Mailing(models.Model):
             'composition_mode': 'mass',
             'mailing_id': self.id,
             'mass_keep_log': self.keep_archives,
+            'mass_force_send': self.sms_force_send,
             'mass_sms_allow_unsubscribe': self.sms_allow_unsubscribe,
         }
 
@@ -183,11 +194,6 @@ class Mailing(models.Model):
                 raise UserError(_('There is no recipients selected.'))
 
             composer = self.env['sms.composer'].with_context(active_id=False).create(mailing._send_sms_get_composer_values(res_ids))
-            # extra_context = self._get_mass_mailing_context()
-
-            # auto-commit except in testing mode
-            # auto_commit = not getattr(threading.currentThread(), 'testing', False)
-            # composer.send_mail(auto_commit=auto_commit)
             composer._action_send_sms()
             mailing.write({'state': 'done', 'sent_date': fields.Datetime.now()})
         return True
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 61c14ce7228..2c774bd9e9c 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -23,10 +23,14 @@
                 <attribute name="attrs">{'invisible': ['|', ('state', 'in', ('in_queue', 'done')), ('mailing_type', '!=', 'mail')]}</attribute>
             </xpath>
             <xpath expr="//button[@name='action_put_in_queue']" position="after">
-                <button name="action_put_in_queue" type="object"
-                    class="oe_highlight" string="Send Now"
+                <button name="action_put_in_queue_sms" type="object"
+                    class="oe_highlight" string="Put in Queue"
                     attrs="{'invisible': ['|', ('mailing_type', '=', 'mail'), ('state', 'in', ('in_queue', 'done'))]}"
-                    confirm="This will send SMS to all recipients. Do you still want to proceed ?"/>
+                    confirm="This will schedule an SMS marketing to all recipients. Do you still want to proceed ?"/>
+                <button name="action_send_now_sms" type="object"
+                    string="Send Now"
+                    attrs="{'invisible': ['|', ('mailing_type', '=', 'mail'), ('state', 'in', ('in_queue', 'done'))]}"
+                    confirm="This will send SMS to all recipients now. Do you still want to proceed ?"/>
             </xpath>
             <!-- Headers / Warnings -->
             <xpath expr="//header" position="after">
@@ -92,6 +96,7 @@
                 <page string="SMS Content" name="sms_body" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">
                     <field name="body_plaintext" widget="sms_widget" required="1"/>
                     <group>
+                        <field name="sms_force_send" invisible="1"/>
                         <field name="sms_allow_unsubscribe"/>
                     </group>
                 </page>
diff --git a/addons/mass_mailing_sms/wizard/sms_composer.py b/addons/mass_mailing_sms/wizard/sms_composer.py
index 584b15c66eb..aef10ac4f2f 100644
--- a/addons/mass_mailing_sms/wizard/sms_composer.py
+++ b/addons/mass_mailing_sms/wizard/sms_composer.py
@@ -74,12 +74,9 @@ class SMSComposer(models.TransientModel):
                 all_bodies[sms_id] = body
         return all_bodies
 
-    def _prepare_mass_sms_values(self, records=None):
-        result = super(SMSComposer, self)._prepare_mass_sms_values(records=records)
+    def _prepare_mass_sms_values(self, records):
+        result = super(SMSComposer, self)._prepare_mass_sms_values(records)
         if self.composition_mode == 'mass' and self.mailing_id:
-            records = records if records is not None else self._get_records()
-
-            # for record_id, sms_values in result.items():
             for record in records:
                 sms_values = result[record.id]
 
@@ -90,8 +87,8 @@ class SMSComposer(models.TransientModel):
                 })
         return result
 
-    def _action_send_sms_mass(self, records=None):
-        sms_all = super(SMSComposer, self)._action_send_sms_mass()
+    def _prepare_mass_sms(self, records, sms_record_values):
+        sms_all = super(SMSComposer, self)._prepare_mass_sms(records, sms_record_values)
         if self.mailing_id:
             updated_bodies = sms_all._update_body_short_links()
             for sms in sms_all:
diff --git a/addons/sms/wizard/sms_composer.py b/addons/sms/wizard/sms_composer.py
index 520c5df9904..9ed3cd2e498 100644
--- a/addons/sms/wizard/sms_composer.py
+++ b/addons/sms/wizard/sms_composer.py
@@ -147,7 +147,12 @@ class SendSMS(models.TransientModel):
         self._action_send_sms()
         return False
 
-    def _action_send_sms(self, force_send=False):
+    def action_send_sms_mass_now(self):
+        if not self.mass_force_send:
+            self.write({'mass_force_send': True})
+        return self.action_send_sms()
+
+    def _action_send_sms(self):
         records = self._get_records()
         if self.composition_mode == 'numbers':
             return self._action_send_sms_numbers()
@@ -183,16 +188,15 @@ class SendSMS(models.TransientModel):
         records = records if records is not None else self._get_records()
 
         sms_record_values = self._prepare_mass_sms_values(records)
-        sms_create_vals = [sms_record_values[record.id] for record in records]
-        sms = self.env['sms.sms'].sudo().create(sms_create_vals)
+        sms = self._prepare_mass_sms(records, sms_record_values)
 
         if sms and self.mass_keep_log and records and issubclass(type(records), self.pool['mail.thread']):
-            log_values = self._prepare_mass_log_values(sms_record_values)
+            log_values = self._prepare_mass_log_values(records, sms_record_values)
             records._message_log_batch(**log_values)
 
         if sms and self.mass_force_send:
             sms.send(auto_commit=False, raise_exception=False)
-
+            return self.env['sms.sms'].sudo().search([('id', 'in', sms.ids)])
         return sms
 
     # ------------------------------------------------------------
@@ -230,8 +234,7 @@ class SendSMS(models.TransientModel):
             all_bodies = self.env['mail.template']._render_template(self.body, records._name, records.ids)
         return all_bodies
 
-    def _prepare_mass_sms_values(self, records=None):
-        records = records if records is not None else self._get_records()
+    def _prepare_mass_sms_values(self, records):
         all_bodies = self._prepare_body_values(records)
         all_recipients = self._prepare_recipient_values(records)
         blacklist_ids = self._get_blacklist_record_ids(records, all_recipients)
@@ -263,13 +266,17 @@ class SendSMS(models.TransientModel):
             }
         return result
 
+    def _prepare_mass_sms(self, records, sms_record_values):
+        sms_create_vals = [sms_record_values[record.id] for record in records]
+        return self.env['sms.sms'].sudo().create(sms_create_vals)
+
     def _prepare_log_body_values(self, sms_records_values):
         result = {}
         for record_id, sms_values in sms_records_values.items():
             result[record_id] = sms_values['body']
         return result
 
-    def _prepare_mass_log_values(self, sms_records_values):
+    def _prepare_mass_log_values(self, records, sms_records_values):
         return {
             'bodies': self._prepare_log_body_values(sms_records_values),
             'message_type': 'sms',
diff --git a/addons/sms/wizard/sms_composer_views.xml b/addons/sms/wizard/sms_composer_views.xml
index 1cb59d99dd3..e35b87949e9 100644
--- a/addons/sms/wizard/sms_composer_views.xml
+++ b/addons/sms/wizard/sms_composer_views.xml
@@ -39,7 +39,12 @@
                     </group>
                 </sheet>
                 <footer>
-                    <button string="Send SMS" type="object" class="oe_highlight" name="action_send_sms"/>
+                    <button string="Send SMS" type="object" class="oe_highlight" name="action_send_sms"
+                        attrs="{'invisible': [('composition_mode', 'not in', ('comment', 'numbers'))]}"/>
+                    <button string="Put in queue" type="object" class="oe_highlight" name="action_send_sms"
+                        attrs="{'invisible': [('composition_mode', '!=', 'mass')]}"/>
+                    <button string="Send Now" type="object" name="action_send_sms_mass_now"
+                        attrs="{'invisible': [('composition_mode', '!=', 'mass')]}"/>
                     <button string="Close" class="btn btn-secondary" special="cancel"/>
                 </footer>
             </form>

From 29d5134d3c640ef14b0fbe2b905cb9a820293c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 24 Sep 2019 16:01:12 +0000
Subject: [PATCH 06/11] [FIX] mass_mailing_sms: fix sms mailing retry not
 really working

Retry was not working for SMS marketing as it was actually not really
implemented. It now correctly unlinks failed sms and traces and reschedule
the mailing accordingly

It is also possible now to force send while being in queue mode to avoid
having to switch too much between states.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/mass_mailing_sms/models/mailing_mailing.py | 15 +++++++++++++++
 .../views/mailing_mailing_views.xml               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py
index 9200bf8618a..b71cf3cc274 100644
--- a/addons/mass_mailing_sms/models/mailing_mailing.py
+++ b/addons/mass_mailing_sms/models/mailing_mailing.py
@@ -75,6 +75,21 @@ class Mailing(models.Model):
             self.write({'sms_force_send': True})
         return self.action_send_mail()
 
+    def action_retry_failed(self):
+        mass_sms = self.filtered(lambda m: m.mailing_type == 'sms')
+        if mass_sms:
+            mass_sms.action_retry_failed_sms()
+        return super(Mailing, self - mass_sms).action_retry_failed()
+
+    def action_retry_failed_sms(self):
+        failed_sms = self.env['sms.sms'].sudo().search([
+            ('mailing_id', 'in', self.ids),
+            ('state', '=', 'error')
+        ])
+        failed_sms.mapped('mailing_trace_ids').unlink()
+        failed_sms.unlink()
+        self.write({'state': 'in_queue'})
+
     def action_test(self):
         if self.mailing_type == 'sms':
             ctx = dict(self.env.context, default_mailing_id=self.id)
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 2c774bd9e9c..b0fb2c129b9 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -29,7 +29,7 @@
                     confirm="This will schedule an SMS marketing to all recipients. Do you still want to proceed ?"/>
                 <button name="action_send_now_sms" type="object"
                     string="Send Now"
-                    attrs="{'invisible': ['|', ('mailing_type', '=', 'mail'), ('state', 'in', ('in_queue', 'done'))]}"
+                    attrs="{'invisible': ['|', ('mailing_type', '=', 'mail'), ('state', 'in', ('done'))]}"
                     confirm="This will send SMS to all recipients now. Do you still want to proceed ?"/>
             </xpath>
             <!-- Headers / Warnings -->

From 1a8530a17814a722bec88e0d97c81bc155f18efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 25 Sep 2019 08:46:30 +0000
Subject: [PATCH 07/11] [FIX] sms: allow system users to unlink sms templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PURPOSE

Allow people to edit sms templates. Limit that rights to some main
application managers.

SPECIFICATIONS

SMS Template access rights
GROUP-------------R-W-C-D-Note
Internal User-----X
​​​Admin / Settings--X-X-X-X
Stock Manager-----X-X-X-stock.picking
Sales Manager-----X-X-X-crm.lead, res.partner
Event Manager-----X-X-X-event.registration
Sub Manager-------X-X-X-sale.subscription, res.partner
MarkAut Manager---X-X-X-no limit
Account Manager---X-X-X-res.partner (followup)

Other groups
  * Online Appointment NO TEMPLATE USED
  * Accounting Manager NO TEMPLATE USED
  * SMS Marketing NO TEMPLATE USED
  * Studio Automated Action Need Technical Settings Anyway
  * Scheduled Actions Need Technical Settings Anyway
  * Server Action Need Technical Settings Anyway

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/sms/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sms/security/ir.model.access.csv b/addons/sms/security/ir.model.access.csv
index c906bc097b7..b5c75f2433f 100644
--- a/addons/sms/security/ir.model.access.csv
+++ b/addons/sms/security/ir.model.access.csv
@@ -3,4 +3,4 @@ access_sms_sms_all,access.sms.sms.all,model_sms_sms,,0,0,0,0
 access_sms_sms_system,access.sms.sms.system,model_sms_sms,base.group_system,1,1,1,1
 access_sms_template_all,access.sms.template.all,model_sms_template,,0,0,0,0
 access_sms_template_user,access.sms.template.user,model_sms_template,base.group_user,1,0,0,0
-access_sms_template_system,access.sms.template.system,model_sms_template,base.group_system,1,1,1,0
+access_sms_template_system,access.sms.template.system,model_sms_template,base.group_system,1,1,1,1

From 10d586634581b37ddd020ebb5a3991e50b646e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 25 Sep 2019 08:54:53 +0000
Subject: [PATCH 08/11] [IMP] crm_sms: allow sales managers to manage sms
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PURPOSE

Allow people to edit sms templates. Limit that rights to some main
application managers.

SPECIFICATIONS

SMS Template access rights
GROUP-------------R-W-C-D-Note
Internal User-----X
​​​Admin / Settings--X-X-X-X
Stock Manager-----X-X-X-stock.picking
Sales Manager-----X-X-X-crm.lead, res.partner
Event Manager-----X-X-X-event.registration
Sub Manager-------X-X-X-sale.subscription, res.partner
MarkAut Manager---X-X-X-no limit
Account Manager---X-X-X-res.partner (followup)

Other groups
  * Online Appointment NO TEMPLATE USED
  * Accounting Manager NO TEMPLATE USED
  * SMS Marketing NO TEMPLATE USED
  * Studio Automated Action Need Technical Settings Anyway
  * Scheduled Actions Need Technical Settings Anyway
  * Server Action Need Technical Settings Anyway

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/crm_sms/__manifest__.py              | 2 ++
 addons/crm_sms/security/ir.model.access.csv | 2 ++
 addons/crm_sms/security/sms_security.xml    | 9 +++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 addons/crm_sms/security/ir.model.access.csv
 create mode 100644 addons/crm_sms/security/sms_security.xml

diff --git a/addons/crm_sms/__manifest__.py b/addons/crm_sms/__manifest__.py
index a32d0b718fe..5b5780916e2 100644
--- a/addons/crm_sms/__manifest__.py
+++ b/addons/crm_sms/__manifest__.py
@@ -10,6 +10,8 @@
     'depends': ['crm', 'sms'],
     'data': [
         'views/crm_lead_views.xml',
+        'security/ir.model.access.csv',
+        'security/sms_security.xml',
     ],
     'installable': True,
     'application': False,
diff --git a/addons/crm_sms/security/ir.model.access.csv b/addons/crm_sms/security/ir.model.access.csv
new file mode 100644
index 00000000000..f94b6f7ffde
--- /dev/null
+++ b/addons/crm_sms/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sms_template_sale_manager,access.sms.template.sale.manager,sms.model_sms_template,sales_team.group_sale_manager,1,1,1,1
diff --git a/addons/crm_sms/security/sms_security.xml b/addons/crm_sms/security/sms_security.xml
new file mode 100644
index 00000000000..a3a88f045e9
--- /dev/null
+++ b/addons/crm_sms/security/sms_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ir_rule_sms_template_sale_manager" model="ir.rule">
+        <field name="name">SMS Template: sale manager CRUD on opportunity / partner templates</field>
+        <field name="model_id" ref="sms.model_sms_template"/>
+        <field name="groups" eval="[(4, ref('sales_team.group_sale_manager'))]"/>
+        <field name="domain_force">[('res_model_id.model', 'in', ('crm.lead', 'res.partner'))]</field>
+    </record>
+</odoo>

From fcf3da44c79395df68bc02ee831ee69883cc937c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 25 Sep 2019 09:31:16 +0000
Subject: [PATCH 09/11] [IMP] stock_sms: allow stock managers to manage sms
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PURPOSE

Allow people to edit sms templates. Limit that rights to some main
application managers.

SPECIFICATIONS

SMS Template access rights
GROUP-------------R-W-C-D-Note
Internal User-----X
​​​Admin / Settings--X-X-X-X
Stock Manager-----X-X-X-stock.picking
Sales Manager-----X-X-X-crm.lead, res.partner
Event Manager-----X-X-X-event.registration
Sub Manager-------X-X-X-sale.subscription, res.partner
MarkAut Manager---X-X-X-no limit
Account Manager---X-X-X-res.partner (followup)

Other groups
  * Online Appointment NO TEMPLATE USED
  * Accounting Manager NO TEMPLATE USED
  * SMS Marketing NO TEMPLATE USED
  * Studio Automated Action Need Technical Settings Anyway
  * Scheduled Actions Need Technical Settings Anyway
  * Server Action Need Technical Settings Anyway

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/stock_sms/__manifest__.py              | 2 ++
 addons/stock_sms/security/ir.model.access.csv | 2 ++
 addons/stock_sms/security/sms_security.xml    | 9 +++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 addons/stock_sms/security/ir.model.access.csv
 create mode 100644 addons/stock_sms/security/sms_security.xml

diff --git a/addons/stock_sms/__manifest__.py b/addons/stock_sms/__manifest__.py
index 5d35cce66da..2e51b257216 100644
--- a/addons/stock_sms/__manifest__.py
+++ b/addons/stock_sms/__manifest__.py
@@ -13,6 +13,8 @@
         'data/mail_data.xml',
         'views/res_config_settings_views.xml',
         'wizard/confirm_stock_sms_views.xml',
+        'security/ir.model.access.csv',
+        'security/sms_security.xml',
     ],
     'application': False,
     'auto_install': True,
diff --git a/addons/stock_sms/security/ir.model.access.csv b/addons/stock_sms/security/ir.model.access.csv
new file mode 100644
index 00000000000..70870ff6dbf
--- /dev/null
+++ b/addons/stock_sms/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sms_template_stock_manager,access.sms.template.stock.manager,sms.model_sms_template,stock.group_stock_manager,1,1,1,1
diff --git a/addons/stock_sms/security/sms_security.xml b/addons/stock_sms/security/sms_security.xml
new file mode 100644
index 00000000000..b729c884241
--- /dev/null
+++ b/addons/stock_sms/security/sms_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ir_rule_sms_template_stock_manager" model="ir.rule">
+        <field name="name">SMS Template: stock manager CRUD on stock picking templates</field>
+        <field name="model_id" ref="sms.model_sms_template"/>
+        <field name="groups" eval="[(4, ref('stock.group_stock_manager'))]"/>
+        <field name="domain_force">[('res_model_id.model', '=', 'stock.picking')]</field>
+    </record>
+</odoo>

From f737a7633ad60063efa34b82c37fb4583fc9893f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 25 Sep 2019 09:39:51 +0000
Subject: [PATCH 10/11] [IMP] event_sms: allow event managers to manage sms
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PURPOSE

Allow people to edit sms templates. Limit that rights to some main
application managers.

SPECIFICATIONS

SMS Template access rights
GROUP-------------R-W-C-D-Note
Internal User-----X
​​​Admin / Settings--X-X-X-X
Stock Manager-----X-X-X-stock.picking
Sales Manager-----X-X-X-crm.lead, res.partner
Event Manager-----X-X-X-event.registration
Sub Manager-------X-X-X-sale.subscription, res.partner
MarkAut Manager---X-X-X-no limit
Account Manager---X-X-X-res.partner (followup)

Other groups
  * Online Appointment NO TEMPLATE USED
  * Accounting Manager NO TEMPLATE USED
  * SMS Marketing NO TEMPLATE USED
  * Studio Automated Action Need Technical Settings Anyway
  * Scheduled Actions Need Technical Settings Anyway
  * Server Action Need Technical Settings Anyway

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/event_sms/__manifest__.py              | 2 ++
 addons/event_sms/security/ir.model.access.csv | 2 ++
 addons/event_sms/security/sms_security.xml    | 9 +++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 addons/event_sms/security/ir.model.access.csv
 create mode 100644 addons/event_sms/security/sms_security.xml

diff --git a/addons/event_sms/__manifest__.py b/addons/event_sms/__manifest__.py
index 756ade6c0e3..94d9df26851 100644
--- a/addons/event_sms/__manifest__.py
+++ b/addons/event_sms/__manifest__.py
@@ -11,6 +11,8 @@
         'data/sms_data.xml',
         'views/event_views.xml',
         'views/event_mail_views.xml',
+        'security/ir.model.access.csv',
+        'security/sms_security.xml',
     ],
     'demo': [
     ],
diff --git a/addons/event_sms/security/ir.model.access.csv b/addons/event_sms/security/ir.model.access.csv
new file mode 100644
index 00000000000..b34e4dd5b87
--- /dev/null
+++ b/addons/event_sms/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sms_template_event_manager,access.sms.template.event.manager,sms.model_sms_template,event.group_event_manager,1,1,1,1
diff --git a/addons/event_sms/security/sms_security.xml b/addons/event_sms/security/sms_security.xml
new file mode 100644
index 00000000000..94bc733cf7a
--- /dev/null
+++ b/addons/event_sms/security/sms_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ir_rule_sms_template_event_manager" model="ir.rule">
+        <field name="name">SMS Template: event manager CRUD on event / registrations templates</field>
+        <field name="model_id" ref="sms.model_sms_template"/>
+        <field name="groups" eval="[(4, ref('event.group_event_manager'))]"/>
+        <field name="domain_force">[('res_model_id.model', 'in', ('event.event', 'event.registration'))]</field>
+    </record>
+</odoo>

From e875357b993b94af03b19dc8c97f394c3fd4c03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 25 Sep 2019 10:17:10 +0000
Subject: [PATCH 11/11] [FIX] sms: do not send sms already failed

Failed SMS should stay in error state and not be sent to IAP as we already
know it will fail. No pain, no gain.

LINKS

Task 2076366 (send now)
Task 2067873 (template access)
PR #37298
PR odoo/enterprise#5750
---
 addons/sms/wizard/sms_composer.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/sms/wizard/sms_composer.py b/addons/sms/wizard/sms_composer.py
index 9ed3cd2e498..841ef609597 100644
--- a/addons/sms/wizard/sms_composer.py
+++ b/addons/sms/wizard/sms_composer.py
@@ -188,16 +188,16 @@ class SendSMS(models.TransientModel):
         records = records if records is not None else self._get_records()
 
         sms_record_values = self._prepare_mass_sms_values(records)
-        sms = self._prepare_mass_sms(records, sms_record_values)
+        sms_all = self._prepare_mass_sms(records, sms_record_values)
 
-        if sms and self.mass_keep_log and records and issubclass(type(records), self.pool['mail.thread']):
+        if sms_all and self.mass_keep_log and records and issubclass(type(records), self.pool['mail.thread']):
             log_values = self._prepare_mass_log_values(records, sms_record_values)
             records._message_log_batch(**log_values)
 
-        if sms and self.mass_force_send:
-            sms.send(auto_commit=False, raise_exception=False)
-            return self.env['sms.sms'].sudo().search([('id', 'in', sms.ids)])
-        return sms
+        if sms_all and self.mass_force_send:
+            sms_all.filtered(lambda sms: sms.state == 'outgoing').send(auto_commit=False, raise_exception=False)
+            return self.env['sms.sms'].sudo().search([('id', 'in', sms_all.ids)])
+        return sms_all
 
     # ------------------------------------------------------------
     # Mass mode specific