summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/report/mailing_trace_report.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-07-17 13:18:38 +0000
committerThibault Delavallée <tde@odoo.com>2019-07-17 15:50:33 +0000
commit49d2899fbd3e9b1c3b689fd5bdeb7f4fa0f6bfd1 (patch)
tree209ed37e6ea42a8c116109d0e48ad1a07ce4d69c /addons/mass_mailing/report/mailing_trace_report.py
parent2011c24dd7530c56ba883ca2a468997c961a53fb (diff)
[REF] mass_mailing: rename mail.mass_mailing model
PURPOSE Mass mailing is currently a bit messy. As SMS will be added as a way to notify people in mass through SMS let us take this opportunity to somehow clean this application: organization, light code cleaning, model renaming. SPECIFICATIONS Rename mail.mass_mailing model to mailing.mailing. Rationale : * mailing is now a prefix for mass mailing models; * mailing.mailing is easier to read / find / understand; Note that mail.mass_mailing.campaign is not updated as it is likely to be removed soon and replaced by simple utm.campaign model. MIGRATION mail.mass_mailing model -> mailing.mailing mail_mass_mailing table -> mailing_mailing LINKS Task ID 2037906 Preparing task ID 1997464 (SMS addition in mass mailing) PR #34938
Diffstat (limited to 'addons/mass_mailing/report/mailing_trace_report.py')
-rw-r--r--addons/mass_mailing/report/mailing_trace_report.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mass_mailing/report/mailing_trace_report.py b/addons/mass_mailing/report/mailing_trace_report.py
index 2afa8906097..be48a863b1e 100644
--- a/addons/mass_mailing/report/mailing_trace_report.py
+++ b/addons/mass_mailing/report/mailing_trace_report.py
@@ -24,7 +24,7 @@ class MailingTraceReport(models.Model):
def init(self):
"""Mass Mail Statistical Report: based on mailing.trace that models the various
- statistics collected for each mailing, and mail.mass_mailing model that models the
+ statistics collected for each mailing, and mailing.mailing model that models the
various mailing performed. """
tools.drop_view_if_exists(self.env.cr, 'mailing_trace_report')
self.env.cr.execute("""
@@ -44,7 +44,7 @@ class MailingTraceReport(models.Model):
mm.email_from
FROM
mailing_trace as ms
- left join mail_mass_mailing as mm ON (ms.mass_mailing_id=mm.id)
+ left join mailing_mailing as mm ON (ms.mass_mailing_id=mm.id)
left join mail_mass_mailing_campaign as mc ON (ms.mass_mailing_campaign_id=mc.id)
left join utm_campaign as utm_campaign ON (mc.campaign_id = utm_campaign.id)
left join utm_source as utm_source ON (mm.source_id = utm_source.id)