diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py
index b71cf3cc274..7fcc0f1b6d6 100644
--- a/addons/mass_mailing_sms/models/mailing_mailing.py
+++ b/addons/mass_mailing_sms/models/mailing_mailing.py
@@ -23,7 +23,7 @@ class Mailing(models.Model):
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)
+ sms_allow_unsubscribe = fields.Boolean('Include opt-out link', default=False)
@api.onchange('mailing_type')
def _onchange_mailing_type(self):
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index b3e35d9558d..14e66b92137 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -106,10 +106,12 @@
-
+
+
+
{
diff --git a/addons/mass_mailing_sms/wizard/sms_composer.py b/addons/mass_mailing_sms/wizard/sms_composer.py
index aef10ac4f2f..fefbeeb0137 100644
--- a/addons/mass_mailing_sms/wizard/sms_composer.py
+++ b/addons/mass_mailing_sms/wizard/sms_composer.py
@@ -3,7 +3,7 @@
import werkzeug.urls
-from odoo import fields, models
+from odoo import fields, models, _
class SMSComposer(models.TransientModel):
@@ -45,7 +45,7 @@ class SMSComposer(models.TransientModel):
trace_values['ignored'] = fields.Datetime.now()
else:
if self.mass_sms_allow_unsubscribe:
- sms_values['body'] = '%s %s' % ((sms_values['body'] or ''), self._get_unsubscribe_url(record.id, trace_code, sms_values['number']))
+ sms_values['body'] = '%s\n%s' % (sms_values['body'] or '', _('STOP SMS : %s') % self._get_unsubscribe_url(record.id, trace_code, sms_values['number']))
return trace_values
def _get_blacklist_record_ids(self, records, recipients_info):