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

[FIX] mass_mailing: wrong copy-paste of statistics computation code 

Mixes the mass_mailing_id and mass_mailing_campaign_id
between the two models. Introduced by 9fc4ad9, PR #472
This commit is contained in:
Olivier Dony 2014-07-04 23:15:22 +02:00
parent f3880a8a09
commit d32fc5c597
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/mass_mailing/mass_mailing.py
View File

@ -46,7 +46,7 @@ class MassMailingCampaign(osv.Model):
})
cr.execute("""
SELECT
mass_mailing_id,
mass_mailing_campaign_id,
COUNT(id) AS sent,
COUNT(CASE WHEN bounced is null THEN 1 ELSE null END) AS delivered,
COUNT(CASE WHEN opened is not null THEN 1 ELSE null END) AS opened,
@ -55,9 +55,9 @@ class MassMailingCampaign(osv.Model):
FROM
mail_mail_statistics
WHERE
mass_mailing_id IN %s
mass_mailing_campaign_id IN %s
GROUP BY
mass_mailing_id
mass_mailing_campaign_id
""", (tuple(ids), ))
for (campaign_id, sent, delivered, opened, replied, bounced) in cr.fetchall():
results[campaign_id] = {
@ -239,8 +239,8 @@ class MassMailing(osv.Model):
GROUP BY
mass_mailing_id
""", (tuple(ids), ))
for (campaign_id, sent, delivered, opened, replied, bounced) in cr.fetchall():
results[campaign_id] = {
for (mass_mailing_id, sent, delivered, opened, replied, bounced) in cr.fetchall():
results[mass_mailing_id] = {
'sent': sent,
# delivered: shouldn't be: all mails - (failed + bounced) ?
'delivered': delivered,