summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/models
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-06 15:46:36 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-06 15:46:36 +0200
commit969eb3fa2f9fe78e3f01a6d4caca1aeae753c58c (patch)
tree25e7833ea517141e4e900305288e1c242dabac46 /addons/mass_mailing/models
parent976499ac782f9704bf1eb26067b5c4b3a9b22b24 (diff)
parentc834c0f5879c0e5023645b4a8a57c1b19a9eee18 (diff)
[MERGE] forward port branch saas-11.2 up to c834c0f5879
Diffstat (limited to 'addons/mass_mailing/models')
-rw-r--r--addons/mass_mailing/models/mail_mail.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index 1589f22d5a4..c89986556d0 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -84,7 +84,7 @@ class MailMail(models.Model):
def _send_prepare_values(self, partner=None):
# TDE: temporary addition (mail was parameter) due to semi-new-API
res = super(MailMail, self)._send_prepare_values(partner)
- base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+ base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url').rstrip('/')
if self.mailing_id and res.get('body') and res.get('email_to'):
emails = tools.email_split(res.get('email_to')[0])
email_to = emails and emails[0] or False