odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail: signature 

bzr revid: chm@openerp.com-20130131162814-93chvgsc4xorh3g2
This commit is contained in:
Christophe Matthieu 2013-01-31 17:28:14 +01:00
parent d2a8780113
commit 46c52b0650
4 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/mail/mail_followers.py
View File

@ -126,37 +126,13 @@ class mail_notification(osv.Model):
else:
company = user.name
model_name = None
record_name = None
if res_model:
res_model_obj = self.pool.get('ir.model')
res_model_ids = res_model_obj.search(cr, uid, [('model', '=', res_model)], context=context)
model_name = res_model_obj.browse(cr, uid, res_model_ids, context=context)[0].name
if res_id:
record_obj = self.pool.get(res_model)
record = record_obj.browse(cr, uid, [res_id], context=context)[0]
record_name = record.name_get() and record.name_get()[0] and record.name_get()[0][1] or record.name
if company:
if record_name:
signature_company = _("This message is written on the document '<b>%(record_name)s</b>' of '<b>%(model_name)s</b>' from %(company)s." % {
'record_name': record_name,
'model_name': model_name,
'company': company
})
else:
signature_company = _("This message is written from %(company)s." % {
'company': company
})
signature_company = _('Send by %(company)s using %(openerp)s.' % {
'company': company,
'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
})
footer = tools.append_content_to_html(footer, "<small>%s</small>" % signature_company, plaintext=False, container_tag='div')
else:
if record_name:
signature_company = _("This message is written on the document '<b>%(record_name)s</b>' of '<b>%(model_name)s</b>'." % {
'record_name': record_name,
'model_name': model_name
})
footer = tools.append_content_to_html(footer, "<small>%s</small>" % signature_company, plaintext=False, container_tag='div')
return footer
def _notify(self, cr, uid, msg_id, context=None):

4
addons/mail/mail_mail.py
View File

@ -150,7 +150,7 @@ class mail_mail(osv.Model):
:param browse_record partner: specific recipient partner
"""
if force or (not mail.subject and mail.model and mail.res_id):
return '%s posted on %s' % (mail.author_id.name, mail.record_name)
return 'Re: %s' % (mail.record_name)
return mail.subject
def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
@ -178,7 +178,7 @@ class mail_mail(osv.Model):
}
url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
text = _("""<small>Access this document <a href="%s">directly in OpenERP</a></small>""") % url
body = tools.append_content_to_html(body, ("<div><p>%s</p></div>" % text), plaintext=False)
body = tools.append_content_to_html(body, ("<div><p>%s</p></div>" % text), plaintext=False, container_tag='div')
except except_orm, e:
pass
return body

2
addons/mail/tests/test_mail_features.py
View File

@ -322,7 +322,7 @@ class test_mail(TestMailBase):
# Mail data
_subject = 'Pigs'
_mail_subject = '%s posted on %s' % (user_raoul.name, group_pigs.name)
_mail_subject = 'Re: %s' % (group_pigs.name)
_body1 = '<p>Pigs rules</p>'
_mail_body1 = '<p>Pigs rules</p>'
_mail_signature1 = '<p>Raoul</p>'

2
addons/portal/mail_mail.py
View File

@ -41,7 +41,7 @@ class mail_mail(osv.Model):
if partner:
contex_signup = dict(context or {}, signup_valid=True)
partner = partner_obj.browse(cr, SUPERUSER_ID, partner.id, context=contex_signup)
text = _("""<small>Access your messages and personal documents through <a href="%s">our Customer Portal</a></small>""") % partner.signup_url
text = _("""<small>Access your messages and documents through <a href="%s">our Customer Portal</a></small>""") % partner.signup_url
# partner is an user: add a link to the document if read access
if partner.user_ids and mail.model and mail.res_id \
and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):