diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 86246bc2745..33f5f1f8a83 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -109,8 +109,7 @@ class mail_notification(osv.Model):
Administrator
"""
footer = ""
@@ -132,7 +131,7 @@ class mail_notification(osv.Model):
company = "%s" % (website_url, user.company_id.name)
else:
company = user.company_id.name
- sent_by = _('Sent by %(company)s using %(openerp)s.')
+ sent_by = _('Sent from %(company)s using %(openerp)s')
signature_company = '%s' % (sent_by % {
'company': company,
'openerp': "OpenERP"
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 12903d02236..ebce0988dd3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -147,6 +147,8 @@ class mail_mail(osv.Model):
def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
"""Generate URLs for links in mails: partner has access (is user):
link to action_mail_redirect action that will redirect to doc or Inbox """
+ if context is None:
+ context = {}
if partner and partner.user_ids:
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
# the parameters to encode for the query and fragment part of url
@@ -161,7 +163,7 @@ class mail_mail(osv.Model):
fragment.update(model=mail.model, res_id=mail.res_id)
url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment)))
- return _("""""") % url
+ return _("""""") % (url, context.get('model_name', ''), mail.record_name)
else:
return None
@@ -233,10 +235,19 @@ class mail_mail(osv.Model):
email sending process has failed
:return: True
"""
+ if context is None:
+ context = {}
ir_mail_server = self.pool.get('ir.mail_server')
-
for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
try:
+ # TDE note: remove me when model_id field is present on mail.message - done here to avoid doing it multiple times in the sub method
+ if mail.model:
+ model_id = self.pool['ir.model'].search(cr, SUPERUSER_ID, [('model', '=', mail.model)], context=context)[0]
+ model = self.pool['ir.model'].browse(cr, SUPERUSER_ID, model_id, context=context)
+ else:
+ model = None
+ if model:
+ context['model_name'] = model.name
# handle attachments
attachments = []
for attach in mail.attachment_ids:
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 0fe2081fa45..79e5be49612 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -39,8 +39,8 @@ class mail_mail(osv.Model):
if partner and not partner.user_ids:
contex_signup = dict(context, signup_valid=True)
signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id],
- model=mail.model, res_id=mail.res_id,
- context=contex_signup)[partner.id]
- return _("""""") % signup_url
+ model=mail.model, res_id=mail.res_id,
+ context=contex_signup)[partner.id]
+ return _(""", """) % (context.get('model_name', ''), mail.record_name, signup_url)
else:
return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context)