Julien De Coster
d88c34d11e
1. The merge of the "email_template" module into the "mail" module. 2. The send action of the mass mailing has been moved from the frontend to a cron, because it was too slow to send over 10,000 mails (the user's browser was blocked for 15 - 20 minutes). Mass mailings have now their own process in the kanban view. 3. Mails sent from the mail form are sent immediatly instead of from the mail queue (for instance, when you go to sales > customers > list view > select 2 -3 customers > More > Partner Mass Mailing). 4. Users have now the choice from which mailing list they want to unsubscribe when they click on the unsubscribe link at the bottom of the mail. 5. Mass mailings inherit from their campaign UTMs and mass mailing campaigns are linked to an UTM campaign. 6. Many little improvements
63 lines
3.0 KiB
Python
63 lines
3.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
from openerp.osv import osv, fields
|
|
|
|
|
|
class MailComposeMessage(osv.TransientModel):
|
|
"""Add concept of mass mailing campaign to the mail.compose.message wizard
|
|
"""
|
|
_inherit = 'mail.compose.message'
|
|
|
|
_columns = {
|
|
'mass_mailing_campaign_id': fields.many2one(
|
|
'mail.mass_mailing.campaign', 'Mass Mailing Campaign'
|
|
),
|
|
'mass_mailing_id': fields.many2one(
|
|
'mail.mass_mailing', 'Mass Mailing', ondelete='cascade'
|
|
),
|
|
'mass_mailing_name': fields.char('Mass Mailing'),
|
|
'mailing_list_ids': fields.many2many(
|
|
'mail.mass_mailing.list', string='Mailing List'
|
|
),
|
|
}
|
|
|
|
def get_mail_values(self, cr, uid, wizard, res_ids, context=None):
|
|
""" Override method that generated the mail content by creating the
|
|
mail.mail.statistics values in the o2m of mail_mail, when doing pure
|
|
email mass mailing. """
|
|
res = super(MailComposeMessage, self).get_mail_values(cr, uid, wizard, res_ids, context=context)
|
|
# use only for allowed models in mass mailing
|
|
if wizard.composition_mode == 'mass_mail' and \
|
|
(wizard.mass_mailing_name or wizard.mass_mailing_id) and \
|
|
wizard.model in [item[0] for item in self.pool['mail.mass_mailing']._get_mailing_model(cr, uid, context=context)]:
|
|
mass_mailing = wizard.mass_mailing_id
|
|
if not mass_mailing:
|
|
reply_to_mode = wizard.no_auto_thread and 'email' or 'thread'
|
|
reply_to = wizard.no_auto_thread and wizard.reply_to or False
|
|
mass_mailing_id = self.pool['mail.mass_mailing'].create(
|
|
cr, uid, {
|
|
'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id and wizard.mass_mailing_campaign_id.id or False,
|
|
'name': wizard.mass_mailing_name,
|
|
'template_id': wizard.template_id and wizard.template_id.id or False,
|
|
'state': 'done',
|
|
'reply_to_mode': reply_to_mode,
|
|
'reply_to': reply_to,
|
|
'sent_date': fields.datetime.now(),
|
|
'body_html': wizard.body,
|
|
'mailing_model': wizard.model,
|
|
'mailing_domain': wizard.active_domain,
|
|
}, context=context)
|
|
mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
|
|
for res_id in res_ids:
|
|
res[res_id].update({
|
|
'mailing_id': mass_mailing.id,
|
|
'statistics_ids': [(0, 0, {
|
|
'model': wizard.model,
|
|
'res_id': res_id,
|
|
'mass_mailing_id': mass_mailing.id,
|
|
})],
|
|
# email-mode: keep original message for routing
|
|
'notification': mass_mailing.reply_to_mode == 'thread',
|
|
'auto_delete': not mass_mailing.keep_archives,
|
|
})
|
|
return res
|