[REF] mass_mailing: first refactor

Mail statistics are now stored onto a separated object (mail.mail.statistics), allowing to
handle emails separately from statistics (among other removing mail.mail entries while keeping
statistics).

Everything linnked to opened/replied/bounce is not managed by mass_mailing, removed added code
in mail module.

bzr revid: tde@openerp.com-20130913115408-322cyjipdg680as6

1 files changed, 9 insertions, 9 deletions

diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 4fe858734fe..7b22bc8f4aa 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -34,8 +34,8 @@ class MailComposeMessage(osv.TransientModel):
         'mass_mailing_campaign_id': fields.many2one(
             'mail.mass_mailing.campaign', 'Mass mailing campaign',
         ),
-        'mass_mailing_segment_id': fields.many2one(
-            'mail.mass_mailing.segment', 'Mass mailing segment',
+        'mass_mailing_id': fields.many2one(
+            'mail.mass_mailing', 'Mass mailing',
             domain="[('mass_mailing_campaign_id', '=', mass_mailing_campaign_id)]",
         ),
     }
@@ -44,18 +44,18 @@ class MailComposeMessage(osv.TransientModel):
         'use_mass_mailing_campaign': False,
     }
 
-    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mail_segment_id, context=None):
-        if mass_mail_segment_id:
-            segment = self.pool['mail.mass_mailing.segment'].browse(cr, uid, mass_mail_segment_id, context=context)
-            if segment.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
+    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mailing_id, context=None):
+        if mass_mailing_id:
+            mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
+            if mass_mailing.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
                 return {}
-        return {'value': {'mass_mailing_segment_id': False}}
+        return {'value': {'mass_mailing_id': False}}
 
     def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
         res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
-        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_segment_id:  # TODO: which kind of mass mailing ?
+        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_id:  # TODO: which kind of mass mailing ?
             for res_id in res_ids:
-                res[res_id]['mass_mailing_segment_id'] = wizard.mass_mailing_segment_id.id
+                res[res_id]['mass_mailing_id'] = wizard.mass_mailing_id.id
         return res