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

[REM] mass_mailing: removed now dead code 

bzr revid: tde@openerp.com-20140415154754-60uvhxt8ho78pdqd
This commit is contained in:
Thibault Delavallée 2014-04-15 17:47:54 +02:00
parent 3eaeae55a0
commit f7d7e34467
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mass_mailing/models/mass_mailing.py
View File

@ -525,15 +525,6 @@ class MassMailing(osv.Model):
# Email Sending
#------------------------------------------------------
def get_recipients_data(self, cr, uid, mailing, res_ids, context=None):
# tde todo: notification link ?
if mailing.mailing_model == 'mail.mass_mailing.contact':
contacts = self.pool['mail.mass_mailing.contact'].browse(cr, uid, res_ids, context=context)
return dict((contact.id, {'partner_id': False, 'name': contact.name, 'email': contact.email}) for contact in contacts)
else:
partners = self.pool['res.partner'].browse(cr, uid, res_ids, context=context)
return dict((partner.id, {'partner_id': partner.id, 'name': partner.name, 'email': partner.email}) for partner in partners)
def get_recipients(self, cr, uid, mailing, context=None):
domain = eval(mailing.mailing_domain)
res_ids = self.pool[mailing.mailing_model].search(cr, uid, domain, context=context)

12
addons/mass_mailing_applicant/models/mass_mailing.py
View File

@ -12,15 +12,3 @@ class MassMailing(osv.Model):
res = super(MassMailing, self)._get_mailing_model(cr, uid, context=context)
res.append(('hr.applicant', 'Applicants'))
return res
def get_recipients_data(self, cr, uid, mailing, res_ids, context=None):
if mailing.mailing_model == 'hr.applicant':
res = {}
for applicant in self.pool['hr.applicant'].browse(cr, uid, res_ids, context=context):
if applicant.partner_id:
res[applicant.id] = {'partner_id': applicant.partner_id.id, 'name': applicant.partner_id.name, 'email': applicant.partner_id.email}
else:
name, email = self.pool['res.partner']._parse_partner_name(applicant.email_from, context=context)
res[applicant.id] = {'partner_id': False, 'name': name or email, 'email': email}
return res
return super(MassMailing, self).get_recipients_data(cr, uid, mailing, res_ids, context=context)

12
addons/mass_mailing_crm/models/mass_mailing.py
View File

@ -12,15 +12,3 @@ class MassMailing(osv.Model):
res = super(MassMailing, self)._get_mailing_model(cr, uid, context=context)
res.append(('crm.lead', 'Leads / Opportunities'))
return res
def get_recipients_data(self, cr, uid, mailing, res_ids, context=None):
if mailing.mailing_model == 'crm.lead':
res = {}
for lead in self.pool['crm.lead'].browse(cr, uid, res_ids, context=context):
if lead.partner_id:
res[lead.id] = {'partner_id': lead.partner_id.id, 'name': lead.partner_id.name, 'email': lead.partner_id.email}
else:
name, email = self.pool['res.partner']._parse_partner_name(lead.email_from, context=context)
res[lead.id] = {'partner_id': False, 'name': name or email, 'email': email}
return res
return super(MassMailing, self).get_recipients_data(cr, uid, mailing, res_ids, context=context)