diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 990830fab18..6f02c31ecf6 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -240,32 +240,6 @@ class mail_mail(osv.Model): return 'Re: %s' % (mail.record_name) return mail.subject - def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None): - """ Return a specific footer for the ir_email body. The main purpose of this method - is to be inherited by Portal, to add modify the link for signing in, in - each notification email a partner receives. - """ - body_footer = "" - # partner is a user, link to a related document (incentive to install portal) - if partner and 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): - related_user = partner.user_ids[0] - try: - self.pool[mail.model].check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context) - 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 - query = {'db': cr.dbname} - fragment = { - 'login': related_user.login, - 'model': mail.model, - 'id': mail.res_id, - } - url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment))) - body_footer = _("""Access this document directly in OpenERP""") % url - except except_orm, e: - pass - return body_footer - def send_get_mail_body(self, cr, uid, mail, partner=None, context=None): """ Return a specific ir_email body. The main purpose of this method is to be inherited to add custom content depending on some module. @@ -275,10 +249,6 @@ class mail_mail(osv.Model): """ body = mail.body_html - # add footer - body_footer = self.send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context) - body = tools.append_content_to_html(body, body_footer, plaintext=False, container_tag='div') - # generate footer link = self._get_partner_access_link(cr, uid, mail, partner, context=context) if link: diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py index 35658456c40..faaf21e5028 100644 --- a/addons/portal/mail_mail.py +++ b/addons/portal/mail_mail.py @@ -39,7 +39,3 @@ class mail_mail(osv.Model): return _("""Access your messages and documents through our Customer Portal""") % partner.signup_url else: return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context) - - def send_get_mail_body(self, cr, uid, mail, partner=None, context=None): - """ TODO: remove me in 8.0 """ - return super(mail_mail, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)